Merge remote-tracking branch 'upstream/main'

Merge pull request #4323 from deltachat/wch423/fix-file-sharing
Fix file sharing to certain apps
2026-07-03 14:05:24 +02:00 · 2026-03-30 16:27:17 +02:00 · 2026-03-30 09:38:02 -04:00 · 2026-03-30 15:32:50 +02:00 · 2026-03-30 15:27:07 +02:00 · 2026-03-30 15:15:25 +02:00
834 changed files with 41959 additions and 30826 deletions
@@ -8,7 +8,7 @@ ArcaneChat is a Delta Chat Android client built on top of the official Delta Cha
 - **Language:** Java (Java 8 compatibility)
 - **Build System:** Gradle with Android Gradle Plugin 8.11.1
 - **Min SDK:** 21 (Android 5.0)
- **Target SDK:** 35 (Android 15)
+- **Target SDK:** 36 (Android 16)
 - **NDK Version:** 27.0.12077973
 - **Native Components:** Rust (deltachat-core-rust submodule)
 - **UI Framework:** Android SDK, Material Design Components
@@ -17,13 +17,23 @@ ArcaneChat is a Delta Chat Android client built on top of the official Delta Cha
 ## Repository Structure

 - `src/main/` - Main application source code
+  - `src/main/java/org/thoughtcrime/securesms/` - Main UI components
+  - `src/main/java/com/b44t/messenger/` - Delta Chat core integration
+  - `src/main/java/chat/delta/rpc/` - JSON-RPC bindings (generated, don't edit manually)
+  - `src/main/res/` - Android resources (layouts, strings, drawables)
 - `src/androidTest/` - Instrumented tests (UI tests, benchmarks)
+  - `src/androidTest/java/com/b44t/messenger/uitests/` - UI tests
+  - `src/androidTest/java/com/b44t/messenger/uibenchmarks/` - Performance benchmarks
 - `src/gplay/` - Google Play flavor-specific code
 - `src/foss/` - F-Droid/FOSS flavor-specific code
- `jni/deltachat-core-rust/` - Native Rust core library (submodule)
+- `jni/deltachat-core-rust/` - Native Rust core library (submodule, **don't edit directly**)
 - `scripts/` - Build and helper scripts
+  - `scripts/ndk-make.sh` - Build native libraries
+  - `scripts/install-toolchains.sh` - Install Rust cross-compilation toolchains
+  - `scripts/generate-rpc-bindings.sh` - Generate JSON-RPC bindings
 - `docs/` - Documentation
 - `fastlane/` - App store metadata and screenshots
+- `.github/workflows/` - CI/CD workflows (GitHub Actions)

 ## Build Instructions

@@ -33,17 +43,36 @@ ArcaneChat is a Delta Chat Android client built on top of the official Delta Cha
   ```bash
   git submodule update --init --recursive
   ```
+   This MUST be done first before any build attempts.

-2. **Build native libraries:**
+2. **Set up environment variables:**
+   ```bash
+   export ANDROID_NDK_ROOT=/path/to/ndk/27.0.12077973
+   export PATH=${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/:${ANDROID_NDK_ROOT}
+   ```
+   Note: Path format varies by OS (linux-x86_64, darwin-x86_64, etc.)
+
+3. **Install Rust toolchains:**
+   ```bash
+   scripts/install-toolchains.sh
+   ```
+   Required for building the native Rust components.
+
+4. **Build native libraries:**
   ```bash
   scripts/ndk-make.sh
   ```
-   Note: First run may take significant time as it builds for all architectures (armeabi-v7a, arm64-v8a, x86, x86_64)
+   **IMPORTANT:** First run takes 30-60 minutes as it builds for all architectures (armeabi-v7a, arm64-v8a, x86, x86_64).
+   For faster development builds, build for a single architecture:
+   ```bash
+   scripts/ndk-make.sh armeabi-v7a
+   ```

-3. **Build APK:**
+5. **Build APK:**
   ```bash
   ./gradlew assembleDebug
   ```
+   Build time: ~2-5 minutes after native libraries are built.

 ### Build Flavors

@@ -55,6 +84,24 @@ ArcaneChat is a Delta Chat Android client built on top of the official Delta Cha
 - Debug APKs: `build/outputs/apk/gplay/debug/` and `build/outputs/apk/fat/debug/`
 - Release APKs require signing configuration in `~/.gradle/gradle.properties`

+### Common Build Issues
+
+1. **Missing NDK or incorrect version:**
+   - Error: `ANDROID_NDK_ROOT not set` or native library missing
+   - Solution: Install NDK 27.0.12077973 and set ANDROID_NDK_ROOT environment variable
+
+2. **Submodules not initialized:**
+   - Error: Missing deltachat-core-rust files
+   - Solution: Run `git submodule update --init --recursive`
+
+3. **Gradle wrapper validation:**
+   - Always validate gradle wrapper before building: `./gradlew wrapper --gradle-version=current`
+   - Wrapper is validated in CI via `gradle/actions/wrapper-validation@v4`
+
+4. **Clean build issues:**
+   - If build fails, try: `./gradlew clean && scripts/ndk-make.sh && ./gradlew assembleDebug`
+   - Remove `build/` directory if clean doesn't work
+
 ## Testing

 ### Running Unit Tests
@@ -62,16 +109,19 @@ ArcaneChat is a Delta Chat Android client built on top of the official Delta Cha
 ```bash
 ./gradlew test
 ```
+Expected duration: 1-3 minutes

 ### Running Instrumented Tests

 1. **Disable animations** on your device/emulator:
   - Developer Options → Set "Window animation scale", "Transition animation scale", and "Animator duration scale" to 0x
+   - **CRITICAL:** Tests will fail if animations are enabled

 2. **Run tests:**
   ```bash
   ./gradlew connectedAndroidTest
   ```
+   Expected duration: 10-30 minutes depending on device/emulator

 ### Online Tests

@@ -129,6 +179,14 @@ TEST_MAIL_PW=yourpassword
 - Java bindings are in `src/main/java/com/b44t/messenger/Dc*.java`
 - JSON-RPC bindings in `chat.delta.rpc.*` package (generated via dcrpcgen)

+### Generating JSON-RPC Bindings
+
+To regenerate JSON-RPC bindings after core changes:
+```bash
+./scripts/generate-rpc-bindings.sh
+```
+**Note:** Requires Rust tooling and [dcrpcgen tool](https://github.com/chatmail/dcrpcgen) installed
+
 ### Working with Translations

 - Translations managed via Transifex (not in repository)
@@ -142,6 +200,43 @@ Decode crash symbols:
 $ANDROID_NDK_ROOT/ndk-stack --sym obj/local/armeabi-v7a --dump crash.txt > decoded.txt
 ```

+## Validation and Quality Checks
+
+### Pre-commit Checks
+
+Before committing changes, always run:
+
+1. **Gradle wrapper validation:**
+   ```bash
+   ./gradlew wrapper --gradle-version=current
+   ```
+
+2. **Build verification:**
+   ```bash
+   ./gradlew assembleDebug
+   ```
+
+3. **Unit tests:**
+   ```bash
+   ./gradlew test
+   ```
+
+4. **Code style:** Match existing code style in modified files (no automatic formatter configured)
+
+### When to Rebuild Native Libraries
+
+Rebuild native libraries (`scripts/ndk-make.sh`) when:
+- Updating deltachat-core-rust submodule
+- Modifying anything in `jni/` directory
+- Changing NDK version
+- After `git clean -fdx` or fresh clone
+
+**DO NOT** rebuild native libraries for:
+- Pure Java/Kotlin code changes
+- Resource file changes
+- Gradle configuration changes (unless changing native library linking)
+- Documentation updates
+
 ## WebXDC Support

 ArcaneChat has extended WebXDC support:
@@ -152,12 +247,24 @@ ArcaneChat has extended WebXDC support:

 ## Important Files

- `build.gradle` - Main build configuration
+- `build.gradle` - Main build configuration (Android Gradle Plugin 8.11.1, Java 8 compatibility)
 - `CONTRIBUTING.md` - Contribution guidelines
- `BUILDING.md` - Detailed build setup
+- `BUILDING.md` - Detailed build setup instructions
 - `RELEASE.md` - Release process
- `proguard-rules.pro` - ProGuard configuration
- `google-services.json` - Firebase configuration (gplay flavor)
+- `proguard-rules.pro` - ProGuard configuration (enabled for both debug and release)
+- `google-services.json` - Firebase configuration (gplay flavor only)
+- `settings.gradle` - Gradle settings
+- `.github/workflows/` - CI/CD configuration
+
+## Dependencies and Constraints
+
+- **Java Version:** Java 8 compatibility (do not use Java 9+ features)
+- **Gradle:** Use wrapper (`./gradlew`) to ensure correct Gradle version
+- **NDK:** Must use version 27.0.12077973 (specified in build.gradle)
+- **Min SDK:** 21 (Android 5.0) - code must be compatible
+- **Target SDK:** 36 (Android 16) - test on this API level when possible
+- **ProGuard:** Always enabled - ensure ProGuard rules are correct for new dependencies
+- **Multi-dex:** Enabled - app exceeds 65k method limit

 ## Package Structure

@@ -173,3 +280,35 @@ ArcaneChat has extended WebXDC support:
 - Native library must be rebuilt after core changes
 - ProGuard is enabled in both debug and release builds
 - Multi-dex is enabled due to app size
+
+## CI/CD Workflows
+
+### Preview APK Workflow (.github/workflows/preview-apk.yml)
+
+Runs on every pull request to build and upload a preview APK:
+
+1. **Setup steps:**
+   - Checks out repository with submodules
+   - Validates Fastlane metadata
+   - Sets up Rust cache (working-directory: jni/deltachat-core-rust)
+   - Sets up Java 17 (Temurin distribution)
+   - Sets up Android SDK
+   - Caches Gradle dependencies
+   - Sets up NDK r27
+
+2. **Build process:**
+   ```bash
+   scripts/install-toolchains.sh && scripts/ndk-make.sh armeabi-v7a
+   ./gradlew --no-daemon -PABI_FILTER=armeabi-v7a assembleFossDebug
+   ```
+   Note: Builds only armeabi-v7a for faster CI builds
+
+3. **Output:** Uploads APK artifact to GitHub Actions
+
+### Important CI Considerations
+
+- Always validate Gradle wrapper before committing changes
+- Fastlane metadata must be valid (validated in CI)
+- Use `--no-daemon` flag for Gradle in CI environments
+- CI builds use FOSS flavor to avoid Google Services dependencies
+- Expected CI build time: 15-25 minutes for full workflow
@@ -0,0 +1,50 @@
+name: Core Cache
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - 'jni/deltachat-core-rust'
+      - 'jni/Android.mk'
+      - 'jni/Application.mk'
+      - 'jni/dc_wrapper.c'
+      - 'scripts/ndk-make.sh'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          submodules: recursive
+
+      - uses: android-actions/setup-android@v3
+      - uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r27
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: jni/deltachat-core-rust
+
+      - name: Get deltachat-core-rust submodule hash
+        id: core-hash
+        run: echo "hash=$(git rev-parse HEAD:jni/deltachat-core-rust)" >> $GITHUB_OUTPUT
+
+      - name: Cache compiled core
+        id: cache-core
+        uses: actions/cache@v4
+        with:
+          path: |
+            jni/arm64-v8a
+            libs/arm64-v8a
+          key: core-arm64-v8a-${{ steps.core-hash.outputs.hash }}-${{ hashFiles('jni/Android.mk', 'jni/Application.mk', 'jni/dc_wrapper.c', 'scripts/ndk-make.sh') }}-ndk-r27
+
+      - name: Compile core
+        if: steps.cache-core.outputs.cache-hit != 'true'
+        env:
+          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
+        run: |
+          export PATH="${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/"
+          scripts/install-toolchains.sh && scripts/ndk-make.sh arm64-v8a
@@ -0,0 +1,35 @@
+name: Code Format
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  spotless:
+    name: Check code format (Spotless)
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
+        with:
+          java-version: 17
+          distribution: temurin
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@v4
+      - name: Check formatting
+        run: ./gradlew spotlessCheck
@@ -14,16 +14,15 @@ jobs:
      - uses: actions/checkout@v5
        with:
          submodules: recursive
+
      - name: Validate Fastlane Metadata
        uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2
-      - uses: Swatinem/rust-cache@v2
-        with:
-          working-directory: jni/deltachat-core-rust
+
      - uses: actions/setup-java@v5
        with:
          java-version: 17
          distribution: 'temurin'
-      - uses: android-actions/setup-android@v3
+
      - uses: actions/cache@v4
        with:
          path: |
@@ -32,23 +31,43 @@ jobs:
          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
          restore-keys: |
            ${{ runner.os }}-gradle-
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@v4
+
+      - uses: android-actions/setup-android@v3
      - uses: nttld/setup-ndk@v1
        id: setup-ndk
        with:
          ndk-version: r27

-      - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v4
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: jni/deltachat-core-rust
+
+      - name: Get deltachat-core-rust submodule hash
+        id: core-hash
+        run: echo "hash=$(git rev-parse HEAD:jni/deltachat-core-rust)" >> $GITHUB_OUTPUT
+
+      - name: Restore compiled core
+        id: core-cache
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            jni/arm64-v8a
+            libs/arm64-v8a
+          key: core-arm64-v8a-${{ steps.core-hash.outputs.hash }}-${{ hashFiles('jni/Android.mk', 'jni/Application.mk', 'jni/dc_wrapper.c', 'scripts/ndk-make.sh') }}-ndk-r27

      - name: Compile core
+        if: steps.core-cache.outputs.cache-hit != 'true'
        env:
          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
        run: |
          export PATH="${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/"
-          scripts/install-toolchains.sh && scripts/ndk-make.sh armeabi-v7a
+          scripts/install-toolchains.sh && scripts/ndk-make.sh arm64-v8a

      - name: Build APK
-        run: ./gradlew --no-daemon -PABI_FILTER=armeabi-v7a assembleFossDebug
+        run: ./gradlew --no-daemon -PABI_FILTER=arm64-v8a assembleFossDebug

      - name: Upload APK
        uses: actions/upload-artifact@v4
@@ -27,7 +27,7 @@ install Rust tooling (read sections below) and the [dcrpcgen tool](https://githu
 then generate the code running the script:

 ```
-./scripts/generate-rpc-bindings.sh
+./scripts/update-rpc-bindings.sh
 ```

 ## Build Using Nix
@@ -2,6 +2,40 @@

 ## Unreleased

+* Fix file sharing to certain apps (e.g. Material Files, etc.)
+
+## v2.48.0
+2026-03
+
+* Add a warning when editing relays
+* Fix message reordering problems in multi-relay setups
+* Some more bug fixes and updated translations
+* Update to core 2.48.0
+
+## v2.47.0
+2026-03
+
+* Allow to set chat description
+* Unified date display in call bubbles
+* Explain at "Settings / Chats / Outgoing Media Quality" how to send original quality
+* Add a basic sticker picker
+* Leave groups and channels before deletion
+* Further minimize metadata in messages and while getting in contact.
+* Increase resilience of multi-relay usage: if on relay goes down, messages are still received in the others.
+* Allow to hide a relay from contacts instead of removing, allowing smoother relay changes
+* HTML emails: allow to review and copy links before opening them
+* Mark call message as seen when accepting/declining a call
+* Fix: keep original sent timestamp for resent messages
+* Fix: make clicking on broadcast member-added messages work always
+* Fix: remove notification when a message is deleted by sender
+* Fix: avoid "reply privately" not quoting the selected message sometimes
+* Fix: properly hide the calls button
+* Some more bug fixes and updated translations
+* Update to core 2.47.0
+
+## v2.43.0
+2026-02
+
 * Improve switch speed when changing profiles
 * Allow to switch profile when sharing or forwarding
 * Display message views count for channel owners
@@ -12,13 +46,24 @@
 * Mark external links with " ↗" to make them clear
 * Make QR code larger on "Add Second Device" screen
 * Add indication for blocked contacts in user profile
+* Allow to start calls with video disabled
 * Show hint for empty contact search results
+* Add background playing for voice messages and other audio files
+* Allow scanning Invitation Code when creating a new profile
+* Add context menu in long-pressing relays items instead of showing buttons
+* Enhanced video player UI
 * Fix: Show dialog if pasted QR codes are invalid
 * Fix: Refresh chat list when returning from conversation if selected profile changed
 * Fix: Update menu when using "select all" in contact selection
 * Fix: Avoid empty profiles after using "add as second device" from welcome screen
+* Fix: Remove from group deselected members in the contact selection list
 * Fix multi-device seen messages synchronization when using multiple relays
-* Update to core 2.39.0
+* Fix mailto handling
+* Fix layout problems inside in-chat apps
+* Fix real-time for in-chat apps that need it
+* Avoid crash when the app is minimized with profile switcher or reactions dialogs open
+* Remove "trash icon" option from contact selection list when adding members to group
+* Update to core 2.43.0

 ## v2.35.0
 2026-01
@@ -73,18 +73,15 @@ esp. before/after screenshots.

 ### Coding Conventions

-Source files are partly derived from different other open source projects
-and may follow different coding styles and conventions.
-
-If you do a PR fixing a bug or adding a feature,
-please embrace the coding convention you see in the corresponding files,
-so that the result fits well together.
-
-Do not refactor or rename things in the same PR
-to make the diff small and the PR easy to review.
-
 Project language is Java.

+Code formatting is enforced via [Spotless](https://github.com/diffplug/spotless) Gradle plugin.
+Auto-format all files by running `./gradlew spotlessApply` before opening a PR.
+CI will fail if files are not formatted correctly so make sure to run the formatter before pushing.
+
+If you do a PR fixing a bug or adding a feature, do not refactor or rename things in the same PR
+to make the diff small and the PR easy to review.
+
 By using [Delta Chat Core](https://github.com/deltachat/deltachat-core-rust)
 there is already a strong separation between "UI" and "Model".
 Further separations and abstraction layers are often not helpful
@@ -1,6 +1,7 @@
 plugins {
    id 'com.android.application' version '8.11.1'
    id 'com.google.gms.google-services' version '4.4.1'
+    id 'com.diffplug.spotless' version '8.3.0'
 }

 repositories {
@@ -33,8 +34,8 @@ android {
    useLibrary 'org.apache.http.legacy'

    defaultConfig {
-        versionCode 30000736
-        versionName "2.36.0"
+        versionCode 30000741
+        versionName "2.48.0"

        applicationId "chat.delta.lite"
        multiDexEnabled true
@@ -72,10 +73,20 @@ android {
    packagingOptions {
        jniLibs {
            doNotStrip '**/*.so'
-            keepDebugSymbols += ['*/mips/*.so', '*/mips64/*.so']
+            keepDebugSymbols += [
+                '*/mips/*.so',
+                '*/mips64/*.so'
+            ]
        }
        resources {
-            excludes += ['LICENSE.txt', 'LICENSE', 'NOTICE', 'asm-license.txt', 'META-INF/LICENSE', 'META-INF/NOTICE']
+            excludes += [
+                'LICENSE.txt',
+                'LICENSE',
+                'NOTICE',
+                'asm-license.txt',
+                'META-INF/LICENSE',
+                'META-INF/NOTICE'
+            ]
        }
    }

@@ -154,14 +165,14 @@ android {
    }

    if(!project.hasProperty("ABI_FILTER")) {
-      splits {
-        abi {
-            enable true
-            reset()
-            include "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-            universalApk true
+        splits {
+            abi {
+                enable true
+                reset()
+                include "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+                universalApk true
+            }
        }
-      }
    }

    project.ext.versionCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4]
@@ -169,16 +180,16 @@ android {
    android.applicationVariants.all { variant ->
        variant.outputs.all { output ->
            output.outputFileName = output.outputFileName
-                .replace("android", "ArcaneChat")
-                .replace("-release", "")
-                .replace(".apk", "-${variant.versionName}.apk")
+                    .replace("android", "ArcaneChat")
+                    .replace("-release", "")
+                    .replace(".apk", "-${variant.versionName}.apk")
            if(project.hasProperty("ABI_FILTER")) {
-              output.versionCodeOverride =
-                variant.versionCode * 10 + project.ext.versionCodes.get(ABI_FILTER)
+                output.versionCodeOverride =
+                        variant.versionCode * 10 + project.ext.versionCodes.get(ABI_FILTER)
            } else {
-              output.versionCodeOverride =
-                variant.versionCode * 10 + project.ext.versionCodes.get(output.getFilter(com.android.build.OutputFile.ABI), 4)
-           }
+                output.versionCodeOverride =
+                        variant.versionCode * 10 + project.ext.versionCodes.get(output.getFilter(com.android.build.OutputFile.ABI), 4)
+            }
        }
    }

@@ -199,7 +210,31 @@ android {
        renderScript true
        aidl true
    }
+}

+spotless {
+    java {
+        target 'src/*/java/**/*.java'
+        targetExclude 'src/main/java/chat/delta/**' // ignore auto-generated code
+        googleJavaFormat()  // Google style = 2-space indent, matches Android Studio defaults
+        removeUnusedImports()
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+    format 'xml', {
+        target 'src/*/res/**/*.xml', 'src/*/AndroidManifest.xml'
+        targetExclude 'src/*/res/values*/strings.xml' // line-break changes invalidate translations
+        eclipseWtp('xml').configFile('spotless/eclipse-wtp-xml.prefs')
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+    groovyGradle {
+        target '*.gradle'
+        greclipse()
+        leadingTabsToSpaces(4)
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
 }

 final def  markwon_version =  '4.6.2'
@@ -211,7 +246,14 @@ dependencies {
    implementation "io.noties.markwon:inline-parser:$markwon_version"
    implementation 'com.airbnb.android:lottie:4.2.2' // Lottie animations support.

+    def media3_version = "1.8.0"   // 1.9.0 need minSdkVersion 23
+
    implementation 'androidx.concurrent:concurrent-futures:1.3.0'
+    implementation 'androidx.core:core:1.17.0'
+    implementation 'androidx.core:core-telecom:1.0.1'
+    implementation 'im.conversations.webrtc:webrtc-android:129.0.0'
+    // For Kotlin->Java interpolation
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.9.4'
    implementation 'androidx.sharetarget:sharetarget:1.2.0'
    implementation 'androidx.webkit:webkit:1.14.0'
    implementation 'androidx.multidex:multidex:2.0.1'
@@ -231,8 +273,11 @@ dependencies {
    implementation 'androidx.work:work-runtime:2.9.1'
    implementation 'androidx.emoji2:emoji2-emojipicker:1.5.0'
    implementation 'com.google.guava:guava:31.1-android'
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.19.1' // plays video and audio
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.19.1' // FIXME: exoplayer dependencies kept for Video, but we shall migrate them at some point
    implementation 'com.google.android.exoplayer:exoplayer-ui:2.19.1'
+    implementation "androidx.media3:media3-exoplayer:$media3_version"
+    implementation "androidx.media3:media3-session:$media3_version"
+    implementation "androidx.media3:media3-ui:$media3_version"
    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
    implementation 'com.google.zxing:core:3.3.0' // fixed version to support SDK<24
    implementation ('com.journeyapps:zxing-android-embedded:4.3.0') { transitive = false } // QR Code scanner
@@ -246,7 +291,8 @@ dependencies {
    implementation 'com.github.amulyakhare:TextDrawable:558677ea31'  // number of unread messages,
    // the one-letter circle for the contacts (when there is not avatar) and a white background.
    implementation 'com.googlecode.mp4parser:isoparser:1.0.6' // MP4 recoding; upgrading eg. to 1.1.22 breaks recoding, however, i have not investigated further, just reset to 1.0.6
-    implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.10.0') { // for the zooming on photos / media
+    implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.10.0') {
+        // for the zooming on photos / media
        exclude group: 'com.android.support', module: 'support-annotations'
    }

@@ -255,7 +301,8 @@ dependencies {
    // <https://github.com/cketti/SafeContentResolver>
    implementation 'de.cketti.safecontentresolver:safe-content-resolver-v21:1.0.0'

-    gplayImplementation('com.google.firebase:firebase-messaging:24.1.2') { // for PUSH notifications, don't upgrade: v25.0.0 requires minSdk>=23
+    gplayImplementation('com.google.firebase:firebase-messaging:24.1.2') {
+        // for PUSH notifications, don't upgrade: v25.0.0 requires minSdk>=23
        exclude group: 'com.google.firebase', module: 'firebase-core'
        exclude group: 'com.google.firebase', module: 'firebase-analytics'
        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
@@ -1,6 +1,8 @@
 ArcaneChat is a decentralized and secure instant messenger that is easy to use for friends and family.

-• Anonymous. Instant onboarding without a phone number, e-mail or other private data.
+• Private. Instant on-boarding without a phone number or other private data.
+
+• Friends & Family: Only chat with people you know. Unknown users cannot message or follow you without mutual consent.

 • Flexible. Supports multiple chat profiles and is easy to setup on multiple devices.

@@ -153,6 +153,42 @@ static uint32_t* jintArray2uint32Pointer(JNIEnv* env, jintArray ja, int* ret_icn
 }


+/************************************************************
+ * DcEventChannel
+ ************************************************************/
+
+static dc_event_channel_t* get_dc_event_channel(JNIEnv *env, jobject obj)
+{
+    static jfieldID fid = 0;
+    if (fid==0) {
+        jclass cls = (*env)->GetObjectClass(env, obj);
+        fid = (*env)->GetFieldID(env, cls, "eventChannelCPtr", "J" /*Signature, J=long*/);
+    }
+    if (fid) {
+        return (dc_event_channel_t*)(*env)->GetLongField(env, obj, fid);
+    }
+    return NULL;
+}
+
+
+JNIEXPORT jlong Java_com_b44t_messenger_DcEventChannel_createEventChannelCPtr(JNIEnv *env, jobject obj)
+{
+    return (jlong)dc_event_channel_new();
+}
+
+
+JNIEXPORT void Java_com_b44t_messenger_DcEventChannel_unrefEventChannelCPtr(JNIEnv *env, jobject obj)
+{
+    dc_event_channel_unref(get_dc_event_channel(env, obj));
+}
+
+
+JNIEXPORT jlong Java_com_b44t_messenger_DcEventChannel_getEventEmitterCPtr(JNIEnv *env, jobject obj)
+{
+    return (jlong)dc_event_channel_get_event_emitter(get_dc_event_channel(env, obj));
+}
+
+
 /*******************************************************************************
 * DcAccounts
 ******************************************************************************/
@@ -172,11 +208,11 @@ static dc_accounts_t* get_dc_accounts(JNIEnv *env, jobject obj)
 }


-JNIEXPORT jlong Java_com_b44t_messenger_DcAccounts_createAccountsCPtr(JNIEnv *env, jobject obj, jstring dir)
+JNIEXPORT jlong Java_com_b44t_messenger_DcAccounts_createAccountsCPtr(JNIEnv *env, jobject obj, jstring dir, jobject chanObj)
 {
    CHAR_REF(dir);
        int writable = 1;
-        jlong accountsCPtr = (jlong)dc_accounts_new(dirPtr, writable);
+        jlong accountsCPtr = (jlong)dc_accounts_new_with_event_channel(dirPtr, writable, get_dc_event_channel(env, chanObj));
    CHAR_UNREF(dir);
    return accountsCPtr;
 }
@@ -910,18 +946,6 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcContext_getContactEncrInfo(JNIEnv *e
 }


-JNIEXPORT jstring Java_com_b44t_messenger_DcContext_initiateKeyTransfer(JNIEnv *env, jobject obj)
-{
-    jstring setup_code = NULL;
-    char* temp = dc_initiate_key_transfer(get_dc_context(env, obj));
-    if (temp) {
-        setup_code = JSTRING_NEW(temp);
-        dc_str_unref(temp);
-    }
-    return setup_code;
-}
-
-
 JNIEXPORT void Java_com_b44t_messenger_DcContext_imex(JNIEnv *env, jobject obj, jint what, jstring dir)
 {
    CHAR_REF(dir);
@@ -1594,15 +1618,6 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_hasHtml(JNIEnv *env, jobject ob
 }


-JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getSetupCodeBegin(JNIEnv *env, jobject obj)
-{
-    char* temp = dc_msg_get_setupcodebegin(get_dc_msg(env, obj));
-        jstring ret =  JSTRING_NEW(temp);
-    dc_str_unref(temp);
-    return ret;
-}
-
-
 JNIEXPORT void Java_com_b44t_messenger_DcMsg_setSubject(JNIEnv *env, jobject obj, jstring text)
 {
    CHAR_REF(text);
@@ -13,3 +13,8 @@
 -keep class org.thoughtcrime.securesms.crypto.KeyStoreHelper* { *; }

 -dontwarn com.google.firebase.analytics.connector.AnalyticsConnector
+
+# Keep WebRTC classes
+-keep class org.webrtc.** { *; }
+-keepclassmembers class org.webrtc.** { *; }
+-keepattributes InnerClasses
@@ -9,3 +9,4 @@ cd "$ROOT_DIR"

 # generate code
 dcrpcgen java --schema schema.json -o ./src/main/java/
+rm schema.json
@@ -1,5 +1,6 @@
 pluginManagement {
    repositories {
+        gradlePluginPortal()
        google()
        mavenCentral()
    }
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+lineWidth=100
+splitMultiAttrs=true
+indentMultipleAttributes=true
+indentationChar=space
+indentationSize=4
+spaceBeforeEmptyCloseTag=true
@@ -11,7 +11,6 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.view.View;
-
 import androidx.annotation.NonNull;
 import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.espresso.UiController;
@@ -19,7 +18,6 @@ import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.espresso.util.TreeIterables;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
-
 import org.hamcrest.Matcher;
 import org.thoughtcrime.securesms.ConversationListActivity;
 import org.thoughtcrime.securesms.R;
@@ -60,10 +58,12 @@ public class TestUtils {
  }

  @NonNull
-  public static ActivityScenarioRule<ConversationListActivity> getOfflineActivityRule(boolean useExistingChats) {
+  public static ActivityScenarioRule<ConversationListActivity> getOfflineActivityRule(
+      boolean useExistingChats) {
    Intent intent =
-            Intent.makeMainActivity(
-                    new ComponentName(getInstrumentation().getTargetContext(), ConversationListActivity.class));
+        Intent.makeMainActivity(
+            new ComponentName(
+                getInstrumentation().getTargetContext(), ConversationListActivity.class));
    if (!useExistingChats) {
      createOfflineAccount();
    }
@@ -72,18 +72,22 @@ public class TestUtils {
  }

  @NonNull
-  public static <T extends Activity> ActivityScenarioRule<T> getOnlineActivityRule(Class<T> activityClass) {
+  public static <T extends Activity> ActivityScenarioRule<T> getOnlineActivityRule(
+      Class<T> activityClass) {
    Context context = getInstrumentation().getTargetContext();
    AccountManager.getInstance().beginAccountCreation(context);
    prepare();
-    return new ActivityScenarioRule<>(new Intent(getInstrumentation().getTargetContext(), activityClass));
+    return new ActivityScenarioRule<>(
+        new Intent(getInstrumentation().getTargetContext(), activityClass));
  }

  private static void prepare() {
-    Prefs.setBooleanPreference(getInstrumentation().getTargetContext(), Prefs.DOZE_ASKED_DIRECTLY, true);
+    Prefs.setBooleanPreference(
+        getInstrumentation().getTargetContext(), Prefs.DOZE_ASKED_DIRECTLY, true);
    if (!AccessibilityUtil.areAnimationsDisabled(getInstrumentation().getTargetContext())) {
-      throw new RuntimeException("To run the tests, disable animations at Developer options' " +
-              "-> 'Window/Transition/Animator animation scale' -> Set all 3 to 'off'");
+      throw new RuntimeException(
+          "To run the tests, disable animations at Developer options' "
+              + "-> 'Window/Transition/Animator animation scale' -> Set all 3 to 'off'");
    }
  }

@@ -116,26 +120,22 @@ public class TestUtils {
        }

        throw new NoMatchingViewException.Builder()
-                .withRootView(view)
-                .withViewMatcher(matcher)
-                .build();
+            .withRootView(view)
+            .withViewMatcher(matcher)
+            .build();
      }
    };
  }

  /**
-   * Perform action of implicitly waiting for a certain view.
-   * This differs from EspressoExtensions.searchFor in that,
-   * upon failure to locate an element, it will fetch a new root view
-   * in which to traverse searching for our @param match
+   * Perform action of implicitly waiting for a certain view. This differs from
+   * EspressoExtensions.searchFor in that, upon failure to locate an element, it will fetch a new
+   * root view in which to traverse searching for our @param match
   *
   * @param viewMatcher ViewMatcher used to find our view
   */
  public static ViewInteraction waitForView(
-          Matcher<View> viewMatcher,
-          int waitMillis,
-          int waitMillisPerTry
-  ) {
+      Matcher<View> viewMatcher, int waitMillis, int waitMillisPerTry) {

    // Derive the max tries
    int maxTries = (int) (waitMillis / waitMillisPerTry);
@@ -164,12 +164,11 @@ public class TestUtils {
  }

  /**
-   * Normally, you would do
-   * onView(withId(R.id.send_button)).perform(click());
-   * to send the draft message. However, in order to change the send button to the attach button
-   * while there is no draft, the send button is made invisible and the attach button is made
-   * visible instead. This confuses the test framework.<br/><br/>
-   *
+   * Normally, you would do onView(withId(R.id.send_button)).perform(click()); to send the draft
+   * message. However, in order to change the send button to the attach button while there is no
+   * draft, the send button is made invisible and the attach button is made visible instead. This
+   * confuses the test framework.<br>
+   * <br>
   * So, this is a workaround for pressing the send button.
   */
  public static void pressSend() {
@@ -10,14 +10,11 @@ import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;

 import android.util.Log;
-
 import androidx.test.espresso.contrib.RecyclerViewActions;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-
 import com.b44t.messenger.TestUtils;
-
 import org.junit.After;
 import org.junit.Ignore;
 import org.junit.Rule;
@@ -34,18 +31,19 @@ public class EnterChatsBenchmark {
  // ==============================================================================================
  // Set this to true if you already have at least 10 chats on your existing DeltaChat installation
  // and want to traverse through them instead of 10 newly created chats
-  private final static boolean USE_EXISTING_CHATS = false;
+  private static final boolean USE_EXISTING_CHATS = false;
  // ==============================================================================================
-  private final static int GO_THROUGH_ALL_CHATS_N_TIMES = 8;
+  private static final int GO_THROUGH_ALL_CHATS_N_TIMES = 8;

  // ==============================================================================================
  // PLEASE BACKUP YOUR ACCOUNT BEFORE RUNNING THIS!
  // ==============================================================================================

-  private final static String TAG = EnterChatsBenchmark.class.getSimpleName();
+  private static final String TAG = EnterChatsBenchmark.class.getSimpleName();

  @Rule
-  public ActivityScenarioRule<ConversationListActivity> activityRule = TestUtils.getOfflineActivityRule(USE_EXISTING_CHATS);
+  public ActivityScenarioRule<ConversationListActivity> activityRule =
+      TestUtils.getOfflineActivityRule(USE_EXISTING_CHATS);

  @Test
  public void createAndEnter10FilledChats() {
@@ -55,7 +53,9 @@ public class EnterChatsBenchmark {
    for (int i = 0; i < GO_THROUGH_ALL_CHATS_N_TIMES; i++) {
      times[i] = "" + timeGoToNChats(10); // 10 group chats were created
    }
-    Log.i(TAG, "MEASURED RESULTS (Benchmark) - Going thorough all 10 chats: " + String.join(",", times));
+    Log.i(
+        TAG,
+        "MEASURED RESULTS (Benchmark) - Going thorough all 10 chats: " + String.join(",", times));
  }

  @Test
@@ -66,13 +66,17 @@ public class EnterChatsBenchmark {
    for (int i = 0; i < GO_THROUGH_ALL_CHATS_N_TIMES; i++) {
      times[i] = "" + timeGoToNChats(1);
    }
-    Log.i(TAG, "MEASURED RESULTS (Benchmark) - Entering and leaving 1 empty chat: " + String.join(",", times));
+    Log.i(
+        TAG,
+        "MEASURED RESULTS (Benchmark) - Entering and leaving 1 empty chat: "
+            + String.join(",", times));
  }

  @Test
  public void enterFilledChat() {
    if (!USE_EXISTING_CHATS) {
-      createChatAndGoBack("Group #1", true, "Hello!", "Some links: https://testrun.org", "And a command: /help");
+      createChatAndGoBack(
+          "Group #1", true, "Hello!", "Some links: https://testrun.org", "And a command: /help");
    }

    String[] times = new String[50];
@@ -82,7 +86,18 @@ public class EnterChatsBenchmark {
      long end = System.currentTimeMillis();
      long diff = end - start;
      pressBack();
-      Log.i(TAG, "Measured (Benchmark) " + (i+1) + "/" + times.length + ": Entering 1 filled chat took " + diff + "ms " + "(going back took " + (System.currentTimeMillis() - end) + "ms)");
+      Log.i(
+          TAG,
+          "Measured (Benchmark) "
+              + (i + 1)
+              + "/"
+              + times.length
+              + ": Entering 1 filled chat took "
+              + diff
+              + "ms "
+              + "(going back took "
+              + (System.currentTimeMillis() - end)
+              + "ms)");

      times[i] = "" + diff;
    }
@@ -91,16 +106,37 @@ public class EnterChatsBenchmark {

  private void create10Chats(boolean fillWithMsgs) {
    if (!USE_EXISTING_CHATS) {
-      createChatAndGoBack("Group #1", fillWithMsgs, "Hello!", "Some links: https://testrun.org", "And a command: /help");
-      createChatAndGoBack("Group #2", fillWithMsgs, "example.org, alice@example.org", "aaaaaaa", "bbbbbb");
-      createChatAndGoBack("Group #3", fillWithMsgs, repeat("Some string ", 600), repeat("Another string", 200), "Hi!!!");
+      createChatAndGoBack(
+          "Group #1",
+          fillWithMsgs,
+          "Hello!",
+          "Some links: https://testrun.org",
+          "And a command: /help");
+      createChatAndGoBack(
+          "Group #2", fillWithMsgs, "example.org, alice@example.org", "aaaaaaa", "bbbbbb");
+      createChatAndGoBack(
+          "Group #3",
+          fillWithMsgs,
+          repeat("Some string ", 600),
+          repeat("Another string", 200),
+          "Hi!!!");
      createChatAndGoBack("Group #4", fillWithMsgs, "xyzabc", "Hi!!!!", "Let's meet!");
-      createChatAndGoBack("Group #5", fillWithMsgs, repeat("aaaa", 40), "bbbbbbbbbbbbbbbbbb", "ccccccccccccccc");
-      createChatAndGoBack("Group #6", fillWithMsgs, "aaaaaaaaaaa", repeat("Hi! ", 1000), "bbbbbbbbbb");
-      createChatAndGoBack("Group #7", fillWithMsgs, repeat("abcdefg ", 500), repeat("xxxxx", 100), "yrrrrrrrrrrrrr");
-      createChatAndGoBack("Group #8", fillWithMsgs, "and a number: 037362/384756", "ccccc", "Nice!");
-      createChatAndGoBack("Group #9", fillWithMsgs, "ddddddddddddddddd", "zuuuuuuuuuuuuuuuu", "ccccc");
-      createChatAndGoBack("Group #10", fillWithMsgs, repeat("xxxxxxyyyyy", 100), repeat("String!!", 10), "abcd");
+      createChatAndGoBack(
+          "Group #5", fillWithMsgs, repeat("aaaa", 40), "bbbbbbbbbbbbbbbbbb", "ccccccccccccccc");
+      createChatAndGoBack(
+          "Group #6", fillWithMsgs, "aaaaaaaaaaa", repeat("Hi! ", 1000), "bbbbbbbbbb");
+      createChatAndGoBack(
+          "Group #7",
+          fillWithMsgs,
+          repeat("abcdefg ", 500),
+          repeat("xxxxx", 100),
+          "yrrrrrrrrrrrrr");
+      createChatAndGoBack(
+          "Group #8", fillWithMsgs, "and a number: 037362/384756", "ccccc", "Nice!");
+      createChatAndGoBack(
+          "Group #9", fillWithMsgs, "ddddddddddddddddd", "zuuuuuuuuuuuuuuuu", "ccccc");
+      createChatAndGoBack(
+          "Group #10", fillWithMsgs, repeat("xxxxxxyyyyy", 100), repeat("String!!", 10), "abcd");
    }
  }

@@ -130,10 +166,10 @@ public class EnterChatsBenchmark {
    onView(withContentDescription(R.string.group_create_button)).perform(click());

    if (fillWithMsgs) {
-      for (String t: texts) {
+      for (String t : texts) {
        sendText(t);
      }
-      for (String t: texts) {
+      for (String t : texts) {
        sendText(t);
      }
    }
@@ -14,11 +14,10 @@ import androidx.test.espresso.contrib.RecyclerViewActions;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-
 import com.b44t.messenger.DcContact;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.TestUtils;
-
+import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -29,8 +28,6 @@ import org.thoughtcrime.securesms.ConversationListActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.connect.DcHelper;

-import java.util.concurrent.TimeUnit;
-
@RunWith(AndroidJUnit4.class)
@LargeTest
 public class ForwardingTest {
@@ -43,7 +40,8 @@ public class ForwardingTest {
  }

  @Rule
-  public final ActivityScenarioRule<ConversationListActivity> activityRule = TestUtils.getOfflineActivityRule(false);
+  public final ActivityScenarioRule<ConversationListActivity> activityRule =
+      TestUtils.getOfflineActivityRule(false);

  @Before
  public void createChats() {
@@ -51,10 +49,13 @@ public class ForwardingTest {
    dcContext.createChatByContactId(DcContact.DC_CONTACT_ID_SELF);
    // Disable bcc_self so that DC doesn't try to send messages to the server.
    // If we didn't do this, messages would stay in DC_STATE_OUT_PENDING forever.
-    // The thing is, DC_STATE_OUT_PENDING show a rotating circle animation, and Espresso doesn't work
+    // The thing is, DC_STATE_OUT_PENDING show a rotating circle animation, and Espresso doesn't
+    // work
    // with animations, and the tests would hang and never finish.
    dcContext.setConfig("bcc_self", "0");
-    activityRule.getScenario().onActivity(a -> createdGroupId = DcHelper.getContext(a).createGroupChat( "group"));
+    activityRule
+        .getScenario()
+        .onActivity(a -> createdGroupId = DcHelper.getContext(a).createGroupChat("group"));
  }

  @After
@@ -68,7 +69,8 @@ public class ForwardingTest {
    // The group is at position 0, self chat is at position 1, device talk is at position 2
    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(2, click()));
    onView(withId(R.id.title)).check(matches(withText(R.string.device_talk)));
-    onView(withId(android.R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(0, longClick()));
+    onView(withId(android.R.id.list))
+        .perform(RecyclerViewActions.actionOnItemAtPosition(0, longClick()));
    onView(withId(R.id.menu_context_forward)).perform(click());
    // Send it to self chat (which is sorted to the top because we're forwarding)
    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(0, click()));
@@ -77,11 +79,13 @@ public class ForwardingTest {

    pressBack();

-    onView(withId(R.id.toolbar_title)).check(matches(withText(R.string.connectivity_not_connected)));
+    onView(withId(R.id.toolbar_title))
+        .check(matches(withText(R.string.connectivity_not_connected)));
    // Self chat moved up because we sent a message there
    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(0, click()));
    onView(withId(R.id.title)).check(matches(withText(R.string.saved_messages)));
-    onView(withId(android.R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(0, longClick()));
+    onView(withId(android.R.id.list))
+        .perform(RecyclerViewActions.actionOnItemAtPosition(0, longClick()));
    onView(withId(R.id.menu_context_forward)).perform(click());
    // Send it to the group
    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(1, click()));
@@ -89,6 +93,7 @@ public class ForwardingTest {
    onView(withId(R.id.title)).check(matches(withText("group")));

    pressBack();
-    onView(withId(R.id.toolbar_title)).check(matches(withText(R.string.connectivity_not_connected)));
+    onView(withId(R.id.toolbar_title))
+        .check(matches(withText(R.string.connectivity_not_connected)));
  }
 }
@@ -14,15 +14,13 @@ import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentat
 import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
-
 import androidx.test.espresso.contrib.RecyclerViewActions;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.TestUtils;
-
+import java.io.File;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -34,9 +32,6 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.ShareActivity;
 import org.thoughtcrime.securesms.connect.DcHelper;

-import java.io.File;
-
-
@RunWith(AndroidJUnit4.class)
@LargeTest
 public class SharingTest {
@@ -48,26 +43,34 @@ public class SharingTest {
  private static int createdSingleChatId;

  @Rule
-  public final ActivityScenarioRule<ConversationListActivity> activityRule = TestUtils.getOfflineActivityRule(false);
+  public final ActivityScenarioRule<ConversationListActivity> activityRule =
+      TestUtils.getOfflineActivityRule(false);

  @Before
  public void createGroup() {
-    activityRule.getScenario().onActivity(a -> createdGroupId = DcHelper.getContext(a).createGroupChat( "group"));
+    activityRule
+        .getScenario()
+        .onActivity(a -> createdGroupId = DcHelper.getContext(a).createGroupChat("group"));
  }

  @Before
  public void createSingleChat() {
-    activityRule.getScenario().onActivity(a -> {
-      int contactId = DcHelper.getContext(a).createContact("", "abc@example.org");
-      createdSingleChatId = DcHelper.getContext(a).createChatByContactId(contactId);
-    });
+    activityRule
+        .getScenario()
+        .onActivity(
+            a -> {
+              int contactId = DcHelper.getContext(a).createContact("", "abc@example.org");
+              createdSingleChatId = DcHelper.getContext(a).createChatByContactId(contactId);
+            });
  }

  @Test
  public void testNormalSharing() {
    Intent i = new Intent(Intent.ACTION_SEND);
    i.putExtra(Intent.EXTRA_TEXT, "Hello!");
-    i.setComponent(new ComponentName(getInstrumentation().getTargetContext().getApplicationContext(), ShareActivity.class));
+    i.setComponent(
+        new ComponentName(
+            getInstrumentation().getTargetContext().getApplicationContext(), ShareActivity.class));
    activityRule.getScenario().onActivity(a -> a.startActivity(i));

    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(0, click()));
@@ -77,9 +80,9 @@ public class SharingTest {
  }

  /**
-   * Test direct sharing from a screenshot.
-   * Also, this is the regression test for https://github.com/deltachat/deltachat-android/issues/2040
-   * where network changes during sharing lead to a bug
+   * Test direct sharing from a screenshot. Also, this is the regression test for
+   * https://github.com/deltachat/deltachat-android/issues/2040 where network changes during sharing
+   * lead to a bug
   */
  @Test
  public void testShareFromScreenshot() {
@@ -92,20 +95,25 @@ public class SharingTest {
        pngImage = file;
      }
    }
-    Uri uri = Uri.parse("content://" + BuildConfig.APPLICATION_ID + ".attachments/" + Uri.encode(pngImage));
+    Uri uri =
+        Uri.parse(
+            "content://" + BuildConfig.APPLICATION_ID + ".attachments/" + Uri.encode(pngImage));
    DcHelper.sharedFiles.put(pngImage, "image/png");

    Intent i = new Intent(Intent.ACTION_SEND);
    i.setType("image/png");
    i.putExtra(Intent.EXTRA_SUBJECT, "Screenshot (Sep 27, 2021 00:00:00");
-    i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
+    i.setFlags(
+        Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
            | Intent.FLAG_ACTIVITY_FORWARD_RESULT
            | Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP
            | Intent.FLAG_RECEIVER_FOREGROUND
            | Intent.FLAG_GRANT_READ_URI_PERMISSION);
    i.putExtra(Intent.EXTRA_STREAM, uri);
    i.putExtra(ShareActivity.EXTRA_CHAT_ID, createdGroupId);
-    i.setComponent(new ComponentName(getInstrumentation().getTargetContext().getApplicationContext(), ShareActivity.class));
+    i.setComponent(
+        new ComponentName(
+            getInstrumentation().getTargetContext().getApplicationContext(), ShareActivity.class));
    activityRule.getScenario().onActivity(a -> a.startActivity(i));

    TestUtils.waitForView(withId(R.id.send_button), 10000, 50);
@@ -121,16 +129,32 @@ public class SharingTest {
  }

  /**
-   * Tests https://github.com/deltachat/interface/blob/master/user-testing/mailto-links.md#mailto-links:
+   * Tests
+   * https://github.com/deltachat/interface/blob/master/user-testing/mailto-links.md#mailto-links:
   *
   * <ul dir="auto">
-   * <li><a href="mailto:abc@example.org">Just an email address</a> - should open a chat with <code>abc@example.org</code> (and maybe ask whether a chat should be created if it does not exist already)</li>
-   * <li><a href="mailto:abc@example.org?subject=testing%20mailto%20uris">email address with subject</a> - should open a chat with <code>abc@example.org</code> and fill <code>testing mailto uris</code>; as we created the chat in the previous step, it should not ask <code>Chat with …</code> but directly open the chat</li>
-   * <li><a href="mailto:abc@example.org?body=this%20is%20a%20test">email address with body</a> - should open a chat with <code>abc@example.org</code>, draft <code>this is a test</code></li>
-   * <li><a href="mailto:abc@example.org?subject=testing%20mailto%20uris&amp;body=this%20is%20a%20test">email address with subject and body</a> - should open a chat with <code>abc@example.org</code>, draft <code>testing mailto uris</code> &lt;newline&gt; <code>this is a test</code></li>
-   * <li><a href="mailto:%20info@example.org">HTML encoding</a> - should open a chat with <code>info@example.org</code></li>
-   * <li><a href="mailto:simplebot@example.org?body=!web%20https%3A%2F%2Fduckduckgo.com%2Flite%3Fq%3Dduck%2520it">more HTML encoding</a> - should open a chat with <code>simplebot@example.org</code>, draft <code>!web https://duckduckgo.com/lite?q=duck%20it</code></li>
-   * <li><a href="mailto:?subject=bla&amp;body=blub">no email, just subject&amp;body</a> - this should let you choose a chat and create a draft <code>bla</code> &lt;newline&gt; <code>blub</code> there</li>
+   *   <li><a href="mailto:abc@example.org">Just an email address</a> - should open a chat with
+   *       <code>abc@example.org</code> (and maybe ask whether a chat should be created if it does
+   *       not exist already)
+   *   <li><a href="mailto:abc@example.org?subject=testing%20mailto%20uris">email address with
+   *       subject</a> - should open a chat with <code>abc@example.org</code> and fill <code>
+   *       testing mailto uris</code>; as we created the chat in the previous step, it should not
+   *       ask <code>Chat with …</code> but directly open the chat
+   *   <li><a href="mailto:abc@example.org?body=this%20is%20a%20test">email address with body</a> -
+   *       should open a chat with <code>abc@example.org</code>, draft <code>this is a test</code>
+   *   <li><a
+   *       href="mailto:abc@example.org?subject=testing%20mailto%20uris&amp;body=this%20is%20a%20test">email
+   *       address with subject and body</a> - should open a chat with <code>abc@example.org</code>,
+   *       draft <code>testing mailto uris</code> &lt;newline&gt; <code>this is a test</code>
+   *   <li><a href="mailto:%20info@example.org">HTML encoding</a> - should open a chat with <code>
+   *       info@example.org</code>
+   *   <li><a
+   *       href="mailto:simplebot@example.org?body=!web%20https%3A%2F%2Fduckduckgo.com%2Flite%3Fq%3Dduck%2520it">more
+   *       HTML encoding</a> - should open a chat with <code>simplebot@example.org</code>, draft
+   *       <code>!web https://duckduckgo.com/lite?q=duck%20it</code>
+   *   <li><a href="mailto:?subject=bla&amp;body=blub">no email, just subject&amp;body</a> - this
+   *       should let you choose a chat and create a draft <code>bla</code> &lt;newline&gt; <code>
+   *       blub</code> there
   * </ul>
   */
  @Test
@@ -140,7 +164,8 @@ public class SharingTest {

    openLink("mailto:abc@example.org?subject=testing%20mailto%20uris");
    onView(withId(R.id.subtitle)).check(matches(withText("abc@example.org")));
-    onView(withHint(R.string.chat_input_placeholder)).check(matches(withText("testing mailto uris")));
+    onView(withHint(R.string.chat_input_placeholder))
+        .check(matches(withText("testing mailto uris")));

    openLink("mailto:abc@example.org?body=this%20is%20a%20test");
    onView(withId(R.id.subtitle)).check(matches(withText("abc@example.org")));
@@ -148,17 +173,22 @@ public class SharingTest {

    openLink("mailto:abc@example.org?subject=testing%20mailto%20uris&body=this%20is%20a%20test");
    onView(withId(R.id.subtitle)).check(matches(withText("abc@example.org")));
-    onView(withHint(R.string.chat_input_placeholder)).check(matches(withText("testing mailto uris\nthis is a test")));
+    onView(withHint(R.string.chat_input_placeholder))
+        .check(matches(withText("testing mailto uris\nthis is a test")));

    openLink("mailto:%20abc@example.org");
    onView(withId(R.id.subtitle)).check(matches(withText("abc@example.org")));

-    openLink("mailto:abc@example.org?body=!web%20https%3A%2F%2Fduckduckgo.com%2Flite%3Fq%3Dduck%2520it");
+    openLink(
+        "mailto:abc@example.org?body=!web%20https%3A%2F%2Fduckduckgo.com%2Flite%3Fq%3Dduck%2520it");
    onView(withId(R.id.subtitle)).check(matches(withText("abc@example.org")));
-    onView(withHint(R.string.chat_input_placeholder)).check(matches(withText("!web https://duckduckgo.com/lite?q=duck%20it")));
+    onView(withHint(R.string.chat_input_placeholder))
+        .check(matches(withText("!web https://duckduckgo.com/lite?q=duck%20it")));

    openLink("mailto:?subject=bla&body=blub");
-    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItem(hasDescendant(withText("abc@example.org")), click()));
+    onView(withId(R.id.list))
+        .perform(
+            RecyclerViewActions.actionOnItem(hasDescendant(withText("abc@example.org")), click()));
    onView(withId(R.id.subtitle)).check(matches(withText("abc@example.org")));
    onView(withHint(R.string.chat_input_placeholder)).check(matches(withText("bla\nblub")));
  }
@@ -170,49 +200,61 @@ public class SharingTest {
  }

  /**
+   *
+   *
   * <ul dir="auto">
-   * <li>Open Saved Messages chat (could be any other chat too)</li>
-   * <li>Go to another app and share some text to DC</li>
-   * <li>In DC select Saved Messages. Edit the shared text if you like. <em>Don't</em> hit the Send button.</li>
-   * <li>Leave DC</li>
-   * <li>Open DC again from the "Recent apps"</li>
-   * <li>Check that your draft is still there</li>
+   *   <li>Open Saved Messages chat (could be any other chat too)
+   *   <li>Go to another app and share some text to DC
+   *   <li>In DC select Saved Messages. Edit the shared text if you like. <em>Don't</em> hit the
+   *       Send button.
+   *   <li>Leave DC
+   *   <li>Open DC again from the "Recent apps"
+   *   <li>Check that your draft is still there
   * </ul>
   */
  @Test
  public void testOpenAgainFromRecents() {
    // Open a chat
-    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItem(hasDescendant(withText("abc@example.org")), click()));
+    onView(withId(R.id.list))
+        .perform(
+            RecyclerViewActions.actionOnItem(hasDescendant(withText("abc@example.org")), click()));

    // Share some text to DC
    Intent i = new Intent(Intent.ACTION_SEND);
    i.putExtra(Intent.EXTRA_TEXT, "Veeery important draft");
-    i.setComponent(new ComponentName(getInstrumentation().getTargetContext().getApplicationContext(), ShareActivity.class));
+    i.setComponent(
+        new ComponentName(
+            getInstrumentation().getTargetContext().getApplicationContext(), ShareActivity.class));
    activityRule.getScenario().onActivity(a -> a.startActivity(i));

    // In DC, select the same chat you opened before
-    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItem(hasDescendant(withText("abc@example.org")), click()));
+    onView(withId(R.id.list))
+        .perform(
+            RecyclerViewActions.actionOnItem(hasDescendant(withText("abc@example.org")), click()));

    // Leave DC and go back to the previous activity
    pressBack();

    // Here, we can't exactly replicate the "steps to reproduce". Previously, the other activity
    // stayed open in the background, but since it doesn't anymore, we need to open it again:
-    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItem(hasDescendant(withText("abc@example.org")), click()));
+    onView(withId(R.id.list))
+        .perform(
+            RecyclerViewActions.actionOnItem(hasDescendant(withText("abc@example.org")), click()));

    // Check that the draft is still there
    // Util.sleep(2000);  // Uncomment for debugging
-    onView(withHint(R.string.chat_input_placeholder)).check(matches(withText("Veeery important draft")));
+    onView(withHint(R.string.chat_input_placeholder))
+        .check(matches(withText("Veeery important draft")));
  }

  /**
   * Regression test:
   *
-   * If you save your contacts's emails in the contacts app of the phone, there are buttons to call
-   * them and also to write an email to them.
+   * <p>If you save your contacts's emails in the contacts app of the phone, there are buttons to
+   * call them and also to write an email to them.
   *
-   * If you click the email button, ArcaneChat opened but instead of opening a chat with that contact,
-   * the chat list was show and "share with" was displayed at the top
+   * <p>If you click the email button, Delta Chat opened but instead of opening a chat with that
+   * contact, the chat list was show and "share with" was displayed at the top
   */
  @Test
  public void testOpenChatFromContacts() {
@@ -1,6 +1,5 @@
 package com.b44t.messenger.uitests.online;

-
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.action.ViewActions.replaceText;
@@ -11,13 +10,10 @@ import static androidx.test.espresso.matcher.ViewMatchers.withHint;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;

 import android.text.TextUtils;
-
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-
 import com.b44t.messenger.TestUtils;
-
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
@@ -30,14 +26,16 @@ import org.thoughtcrime.securesms.WelcomeActivity;
@LargeTest
 public class OnboardingTest {
  @Rule
-  public ActivityScenarioRule<WelcomeActivity> activityRule = TestUtils.getOnlineActivityRule(WelcomeActivity.class);
+  public ActivityScenarioRule<WelcomeActivity> activityRule =
+      TestUtils.getOnlineActivityRule(WelcomeActivity.class);

  @Test
  public void testAccountCreation() {
    if (TextUtils.isEmpty(BuildConfig.TEST_ADDR) || TextUtils.isEmpty(BuildConfig.TEST_MAIL_PW)) {
-      throw new RuntimeException("You need to set TEST_ADDR and TEST_MAIL_PW; " +
-              "either in gradle.properties or via an environment variable. " +
-              "See README.md for more details.");
+      throw new RuntimeException(
+          "You need to set TEST_ADDR and TEST_MAIL_PW; "
+              + "either in gradle.properties or via an environment variable. "
+              + "See README.md for more details.");
    }
    onView(withText(R.string.scan_invitation_code)).check(matches(isClickable()));
    onView(withText(R.string.import_backup_title)).check(matches(isClickable()));
@@ -0,0 +1,19 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="228"
+    android:viewportHeight="280">
+    <group
+        android:scaleX="0.35014287"
+        android:scaleY="0.43"
+        android:translateX="74.08372"
+        android:translateY="79.8">
+        <path
+            android:pathData="m10.03,234.14c0.3,-0.01 0.6,-0.02 0.9,-0.04 -0.07,-0.49 -0.14,-0.97 -0.2,-1.46 -0.15,-1.34 -0.26,-2.69 -0.25,-4.04 -0.02,-0.86 -0.05,-1.71 -0.07,-2.57 -0.09,-0.06 -0.18,-0.13 -0.27,-0.19 -0.02,-0.02 -0.04,-0.03 -0.07,-0.05zM44.87,232.95c11.71,-8.35 26.86,-14.79 46.21,-15.9 0,0 39.93,-0.27 47.91,-3.53 7.98,-3.26 68.68,-14.69 82.94,-98.43 14.26,-83.74 -1.06,-115.09 -1.06,-115.09 0,0 -21.14,55.68 -81.02,59.81 0,0 -14.5,1.03 -38.82,1.42 -24.32,0.39 -75.77,20.65 -90.55,85.62l-0.22,43.44c2.5,4.22 5.49,8.12 8.91,11.66 3.99,4.11 8.11,8.12 12.79,11.45 2.26,1.65 4.65,3.2 6.51,5.33 1.94,2.34 3.33,5 4.2,7.93 0.71,2.1 1.45,4.2 2.2,6.28z"
+            android:fillColor="@color/ic_launcher_background" />
+        <path
+            android:pathData="m217.97,45.86c-0.3,0.01 -0.6,0.02 -0.9,0.04 0.07,0.49 0.14,0.97 0.2,1.46 0.15,1.34 0.26,2.69 0.25,4.04 0.02,0.86 0.05,1.71 0.07,2.57 0.09,0.06 0.18,0.13 0.27,0.19 0.02,0.02 0.04,0.03 0.07,0.05zM183.13,47.05c-11.71,8.35 -26.86,14.79 -46.21,15.9 0,0 -39.93,0.27 -47.91,3.53 -7.98,3.26 -68.68,14.69 -82.94,98.43 -14.26,83.74 1.06,115.09 1.06,115.09 0,0 21.14,-55.68 81.02,-59.81 0,0 14.5,-1.03 38.82,-1.42 24.32,-0.39 75.77,-20.65 90.55,-85.62l0.22,-43.44c-2.5,-4.22 -5.49,-8.12 -8.91,-11.66 -3.99,-4.11 -8.11,-8.12 -12.79,-11.45 -2.26,-1.65 -4.65,-3.2 -6.51,-5.33 -1.94,-2.34 -3.33,-5 -4.2,-7.93 -0.71,-2.1 -1.45,-4.2 -2.2,-6.28z"
+            android:fillColor="@color/ic_launcher_background" />
+    </group>
+</vector>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/white" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/white" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">

-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />

-  <application>
-    <service
-        android:name=".connect.KeepAliveService"
-        android:foregroundServiceType="specialUse"
-        android:enabled="true" />
-  </application>
+    <application>
+        <service
+            android:name=".connect.KeepAliveService"
+            android:foregroundServiceType="specialUse"
+            android:enabled="true" />
+    </application>

 </manifest>
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.notifications;

 import android.content.Context;
-
 import androidx.annotation.Nullable;

 /*
@@ -10,6 +9,11 @@ import androidx.annotation.Nullable;
 */
 public class FcmReceiveService {
  public static void register(Context context) {}
+
  public static void waitForRegisterFinished() {}
-  @Nullable public static String getToken() { return null; }
+
+  @Nullable
+  public static String getToken() {
+    return null;
+  }
 }
@@ -1,34 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">

-  <!-- force compiling emojipicker on sdk<21 and firebase on sdk<19; runtime checks are required then -->
-  <uses-sdk tools:overrideLibrary="androidx.emoji2.emojipicker, com.google.firebase.messaging, com.google.android.gms.cloudmessaging"/>
+    <meta-data
+        android:name="firebase_analytics_collection_deactivated"
+        android:value="true" />
+    <meta-data
+        android:name="google_analytics_adid_collection_enabled"
+        android:value="false" />
+    <meta-data
+        android:name="firebase_messaging_auto_init_enabled"
+        android:value="false" />

-  <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
-  <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
-  <meta-data android:name="firebase_messaging_auto_init_enabled" android:value="false" />
+    <application>
+        <service
+            android:name=".connect.KeepAliveService"
+            android:foregroundServiceType="dataSync"
+            android:enabled="true" />

-  <application>
-    <service
-        android:name=".connect.KeepAliveService"
-        android:foregroundServiceType="dataSync"
-        android:enabled="true" />
+        <service
+            android:name=".notifications.FcmReceiveService"
+            android:foregroundServiceType="dataSync"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>

-    <service
-        android:name=".notifications.FcmReceiveService"
-        android:foregroundServiceType="dataSync"
-        android:exported="true">
-      <intent-filter>
-        <action android:name="com.google.firebase.MESSAGING_EVENT" />
-      </intent-filter>
-    </service>
-
-    <provider
-        android:name="com.google.firebase.provider.FirebaseInitProvider"
-        android:authorities="${applicationId}.firebaseinitprovider"
-        tools:node="remove">
-    </provider>
-  </application>
+        <provider
+            android:name="com.google.firebase.provider.FirebaseInitProvider"
+            android:authorities="${applicationId}.firebaseinitprovider"
+            tools:node="remove">
+        </provider>
+    </application>

 </manifest>
@@ -1,20 +1,16 @@
 package org.thoughtcrime.securesms.notifications;

 import android.content.Context;
-import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
-
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
-
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.service.FetchForegroundService;
@@ -35,36 +31,38 @@ public class FcmReceiveService extends FirebaseMessagingService {
      return;
    }

-    Util.runOnAnyBackgroundThread(() -> {
-      final String rawToken;
+    Util.runOnAnyBackgroundThread(
+        () -> {
+          final String rawToken;

-      try {
-        synchronized (INIT_LOCK) {
-          if (!initialized) {
-            // manual init: read tokens from `./google-services.json`;
-            // automatic init disabled in AndroidManifest.xml to skip FCM code completely.
-            FirebaseApp.initializeApp(context);
+          try {
+            synchronized (INIT_LOCK) {
+              if (!initialized) {
+                // manual init: read tokens from `./google-services.json`;
+                // automatic init disabled in AndroidManifest.xml to skip FCM code completely.
+                FirebaseApp.initializeApp(context);
+              }
+              initialized = true;
+            }
+            rawToken = Tasks.await(FirebaseMessaging.getInstance().getToken());
+          } catch (Exception e) {
+            // we're here usually when FCM is not available and initializeApp() or getToken()
+            // failed.
+            Log.w(TAG, "cannot get FCM token for " + BuildConfig.APPLICATION_ID + ": " + e);
+            triedRegistering = true;
+            return;
+          }
+          if (TextUtils.isEmpty(rawToken)) {
+            Log.w(TAG, "got empty FCM token for " + BuildConfig.APPLICATION_ID);
+            triedRegistering = true;
+            return;
          }
-          initialized = true;
-        }
-        rawToken = Tasks.await(FirebaseMessaging.getInstance().getToken());
-      } catch (Exception e) {
-        // we're here usually when FCM is not available and initializeApp() or getToken() failed.
-        Log.w(TAG, "cannot get FCM token for " + BuildConfig.APPLICATION_ID + ": " + e);
-        triedRegistering = true;
-        return;
-      }
-      if (TextUtils.isEmpty(rawToken)) {
-        Log.w(TAG, "got empty FCM token for " + BuildConfig.APPLICATION_ID);
-        triedRegistering = true;
-        return;
-      }

-      prefixedToken = addPrefix(rawToken);
-      Log.i(TAG, "FCM token: " + prefixedToken);
-      ApplicationContext.getDcAccounts().setPushDeviceToken(prefixedToken);
-      triedRegistering = true;
-    });
+          prefixedToken = addPrefix(rawToken);
+          Log.i(TAG, "FCM token: " + prefixedToken);
+          ApplicationContext.getDcAccounts().setPushDeviceToken(prefixedToken);
+          triedRegistering = true;
+        });
  }

  // wait a until FCM registration got a token or not.
@@ -98,7 +96,8 @@ public class FcmReceiveService extends FirebaseMessagingService {
    // ForegroundServiceStartNotAllowedException.
    // So, it's recommended to check the result of RemoteMessage.getPriority() and
    // confirm it's PRIORITY_HIGH() before attempting to start a foreground service.
-    // source: https://developer.android.com/develop/background-work/services/fgs/restrictions-bg-start
+    // source:
+    // https://developer.android.com/develop/background-work/services/fgs/restrictions-bg-start
    if (remoteMessage.getPriority() == RemoteMessage.PRIORITY_HIGH) {
      FetchForegroundService.start(this);
    } else {
@@ -5,7 +5,6 @@
      <li><a href="#howtoe2ee">How can I find people to chat with?</a></li>
      <li><a href="#why-is-a-chat-marked-as-request">Why is a chat marked as “Request”?</a></li>
      <li><a href="#how-can-i-put-two-of-my-friends-in-contact-with-each-other">How can I put two of my friends in contact with each other?</a></li>
-      <li><a href="#podporuje-delta-chat-obrázky-videa-a-jiné-přílohy">Podporuje Delta Chat obrázky, videa a jiné přílohy?</a></li>
      <li><a href="#multiple-accounts">What are profiles? How can I switch between them?</a></li>
      <li><a href="#kdo-uvidí-můj-profilový-obrázek">Kdo uvidí můj profilový obrázek?</a></li>
      <li><a href="#signature">Can I set a Bio/Status with Delta Chat?</a></li>
@@ -14,6 +13,7 @@
      <li><a href="#what-does-the-green-dot-mean">What does the green dot mean?</a></li>
      <li><a href="#what-do-the-ticks-shown-beside-outgoing-messages-mean">What do the ticks shown beside outgoing messages mean?</a></li>
      <li><a href="#edit">Correct typos and delete messages after sending</a></li>
+      <li><a href="#mediaquality">How is media quality handled?</a></li>
      <li><a href="#ephemeralmsgs">How do disappearing messages work?</a></li>
      <li><a href="#delold">What happens if I turn on “Delete Messages from Device”?</a></li>
      <li><a href="#remove-account">How can I delete my chat profile?</a></li>
@@ -218,19 +218,6 @@ You can also add a little introduction message.</p>
 <p>The second contact will receive a <strong>card</strong> then
 and can tap it to start chatting with the first contact.</p>
    
-      <h3 id="podporuje-delta-chat-obrázky-videa-a-jiné-přílohy">
-        
-        
-          Podporuje Delta Chat obrázky, videa a jiné přílohy? <a href="#podporuje-delta-chat-obrázky-videa-a-jiné-přílohy" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
-or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>For performance, images are optimized and sent at a smaller size by default, but you can send it as a “file” to preserve the original.</p>
-    
      <h3 id="multiple-accounts">
        
        
@@ -412,6 +399,32 @@ Notifications are not sent and there is no time limit.</p>
 <p>Note, that the original message may still be received by chat members
 who could have already replied, forwarded, saved, screenshotted or otherwise copied the message.</p>
    
+      <h3 id="mediaquality">
+        
+        
+          How is media quality handled? <a href="#mediaquality" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach-</strong>
+or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons.</p>
+
+<ul>
+  <li>
+    <p>By default, compression ensures <strong>fast, efficient delivery</strong> that respects everyone’s data limits and storage.
+This is ideal for everyday communication.</p>
+  </li>
+  <li>
+    <p>In regions with worse connectivity,
+you can choose higher compression at <strong>Settings → Chats → Outgoing Media Quality</strong>.</p>
+  </li>
+  <li>
+    <p>If you specifically need to send media in its <strong>original quality</strong>, use <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach → File</strong> in the chat.
+Please use this method sparingly, as sending original files will significantly increase data usage for you and all recipients in the chat.</p>
+  </li>
+</ul>
+    
      <h3 id="ephemeralmsgs">
        
        
@@ -1030,22 +1043,26 @@ Relays are operated by different groups and people.</p>
 <p>By default, after installation, a relay is <strong>automatically set up</strong>,
 so you do not need to care about that.
 However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+you can configure relays at <strong>Settings → Advanced → Relays</strong>:</p>

 <ul>
  <li>
    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
+<a href="https://chatmail.at/relays">chatmail.at/relays</a> shows some known ones.
+If you have multiple relays, you will receive messages on all of them.
+Contacts learn your current relays automatically when you message them.</p>
  </li>
  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
+    <p>Tap on a relay to set it as <strong>used for sending</strong>.</p>
  </li>
  <li>
    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
+contacts who only know this relay may not reach you until you message them again.
+To stay reachable in the meantime, choose <strong>Hide from Contacts</strong> in the confirmation dialog
+instead of removing it right away.</p>
+  </li>
+  <li>
+    <p>To <strong>show</strong> a hidden relay again, tap on it.</p>
  </li>
 </ul>

@@ -1188,6 +1205,10 @@ to exchange encryption setup information through QR-code scanning or “invite l
  <li>
    <p><a href="https://autocrypt.org">Autocrypt</a> is used for automatically
 establishing end-to-end encryption between contacts and all members of a group chat.</p>
+  </li>
+  <li>
+    <p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026, 
+will bring post-quantum resistant encryption and forward secrecy.</p>
  </li>
  <li>
    <p><a href="https://github.com/chatmail/core/blob/main/spec.md#attaching-a-contact-to-a-message">Sharing a contact to a
@@ -1372,12 +1393,10 @@ Instead, all group metadata is end-to-end encrypted and stored on end-user devic
 <p>Servers can therefore only see:</p>

 <ul>
-  <li>the sender and receiver addresses</li>
-  <li>and the message size.</li>
+  <li>Sender and receiver addresses, randomly generated by default</li>
+  <li>Message size</li>
 </ul>

-<p>By default, the addresses are randomly generated.</p>
-
 <p>All other message, contact and group metadata resides in the end-to-end encrypted part of messages.</p>
    
      <h3 id="device-seizure">
@@ -1453,7 +1472,7 @@ but an implementation has not been agreed as a priority yet.</p>
        
      </h3>

-<p>No, not yet.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

 <p>Delta Chat today doesn’t support Perfect Forward Secrecy (PFS).
 This means that if your private decryption key is leaked,
@@ -1464,12 +1483,9 @@ Otherwise, someone obtaining your decryption keys
 is typically also able to get all your non-deleted messages
 and doesn’t even need to decrypt any previously collected messages.</p>

-<p>We designed a Forward Secrecy approach that withstood 
-initial examination from some cryptographers and implementation experts 
-but is pending a more formal write up 
-to ascertain it reliably works in federated messaging and with multi-device usage,
-before it could be implemented in <a href="https://github.com/chatmail/core">chatmail core</a>,
-which would make it available in all <a href="https://chatmail.at/clients">chatmail clients</a>.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will provide reliable deletion (forward secrecy) through automatic key rotation.
+This approach is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="pqc">
        
@@ -1479,12 +1495,13 @@ which would make it available in all <a href="https://chatmail.at/clients">chatm
        
      </h3>

-<p>No, not yet.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

-<p>Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
-which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>. 
-We aim to add PQC support in <a href="https://github.com/chatmail/core">chatmail core</a>  after the draft is finalized at the IETF
-in collaboration with other OpenPGP implementers.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will bring post-quantum resistant encryption to protect against quantum computer attacks.
+Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
+which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>.
+The implementation is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="how-can-i-manually-check-encryption-information">
        
@@ -5,7 +5,6 @@
      <li><a href="#howtoe2ee">Wie finde ich Leute, mit denen ich chatten kann?</a></li>
      <li><a href="#warum-ist-ein-chat-als-anfrage-markiert">Warum ist ein Chat als “Anfrage” markiert?</a></li>
      <li><a href="#wie-kann-ich-zwei-meiner-freunde-miteinander-in-kontakt-bringen">Wie kann ich zwei meiner Freunde miteinander in Kontakt bringen?</a></li>
-      <li><a href="#unterstützt-delta-chat-bilder-videos-und-dateianhänge">Unterstützt Delta Chat Bilder, Videos und Dateianhänge?</a></li>
      <li><a href="#multiple-accounts">Was sind Profile? Wie kann ich zwischen ihnen wechseln?</a></li>
      <li><a href="#wer-sieht-mein-profilbild">Wer sieht mein Profilbild?</a></li>
      <li><a href="#signature">Kann ich einen Status festlegen?</a></li>
@@ -14,6 +13,7 @@
      <li><a href="#was-bedeutet-der-grüne-punkt">Was bedeutet der grüne Punkt?</a></li>
      <li><a href="#was-bedeuten-die-häkchen-neben-den-ausgehenden-nachrichten">Was bedeuten die Häkchen neben den ausgehenden Nachrichten?</a></li>
      <li><a href="#edit">Schreibfehler korrigieren und Nachrichten nach dem Senden löschen</a></li>
+      <li><a href="#mediaquality">Medienqualität und Datenverbrauch</a></li>
      <li><a href="#ephemeralmsgs">Wie funktionieren “Verschwindende Nachrichten”?</a></li>
      <li><a href="#delold">Was passiert, wenn ich “Nachrichten vom Gerät löschen” aktiviere?</a></li>
      <li><a href="#remove-account">Wie kann ich mein Chat-Profil löschen?</a></li>
@@ -109,7 +109,7 @@

 <ul>
  <li>
-    <p>Einfache Erstellung von <strong>privaten Chat-Profile</strong> mit sicheren, schnellen und interoperablen <a href="https://chatmail.at/relays">Chatmail-Servern</a>,
+    <p>Einfache Erstellung von <strong>privaten Chat-Profilen</strong> mit sicheren, schnellen und interoperablen <a href="https://chatmail.at/relays">Chatmail-Servern</a>,
 die sofortige Push-Benachrichtigungen für iOS- und Android-Geräte bieten.</p>
  </li>
  <li>
@@ -137,17 +137,17 @@ basierend auf <a href="https://github.com/chatmail/core/blob/main/standards.md#s
      </h3>

 <p>Beachte zunächst, dass Delta Chat ein privater Messenger ist.
-Es gibt keine öffentliches Verzeichnis, du entscheiden selbst über deine Kontakte.</p>
+Es gibt kein öffentliches Verzeichnis, du entscheidest selbst über deine Kontakte.</p>

 <ul>
  <li>
    <p>Wenn du <strong>persönlich</strong> mit deinen Freunden oder Familie zusammen bist,
 tippe auf das <strong>QR-Code</strong>-Symbol <img style="vertical-align:middle; height:1.3em; margin:1px" src="../qr-icon.png" />
 auf dem Hauptbildschirm.<br />
-Bitte deinen Chatpartner den QR-Code mit Delta Chat zu <strong>scannen</strong>.</p>
+Bitte dann deinen Chatpartner den QR-Code mit Delta Chat zu <strong>scannen</strong>.</p>
  </li>
  <li>
-    <p>Für eine Kontaktaufnahme <strong>aus der Ferne</strong>, klicke im selben Bildschirm auf “Kopieren” oder “Teilen” und sende den <strong>Einladungslink</strong> über einen anderen privaten Chat.</p>
+    <p>Für eine Kontaktaufnahme <strong>aus der Ferne</strong> klicke im selben Bildschirm auf “Kopieren” oder “Teilen” und sende den <strong>Einladungslink</strong> über einen anderen privaten Chat.</p>
  </li>
 </ul>

@@ -177,7 +177,7 @@ wird eine Ende-zu-Ende-Verschlüsselung zwischen allen Mitgliedern eingerichtet.
        
      </h3>

-<p>Da Delta Chat ein privater Messenger ist, können dir zunächst nur Freunde und Familienmitglieder, denen du deinen <a href="#howtoe2ee">QR-Code oder Einladungslink</a> schickst, schreiben.</p>
+<p>Da Delta Chat ein privater Messenger ist, können dir zunächst nur Freunde und Familienmitglieder schreiben, denen du deinen <a href="#howtoe2ee">QR-Code oder Einladungslink</a> schickst.</p>

 <p>Deine Freunde können deine Kontaktdaten dann mit anderen Freunden teilen. Dies wird als <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Anfrage</b> angezeigt.</p>

@@ -186,12 +186,12 @@ wird eine Ende-zu-Ende-Verschlüsselung zwischen allen Mitgliedern eingerichtet.
    <p>Du musst die Anfrage <strong>akzeptieren</strong>, bevor du antworten kannst.</p>
  </li>
  <li>
-    <p>Du kannst sie auch “löschen”, wenn du vorerst nicht mit ihm chatten möchten.</p>
+    <p>Du kannst sie auch “löschen”, wenn du vorerst nicht mit dieser Person chatten möchtest.</p>
  </li>
  <li>
-    <p>If you delete a request, future messages from that contact will still appear
-as message request, so you can change your mind. If you really don’t want to
-receive messages from this person, consider <strong>blocking</strong> them.</p>
+    <p>Wenn du eine Anfrage löschst, werden zukünftige Nachrichten von diesem Kontakt weiterhin
+als Nachrichtenanfrage angezeigt, sodass du deine Meinung ändern kannst. Wenn du wirklich keine
+Nachrichten von dieser Person erhalten möchtest, solltest du sie <strong>blockieren</strong>.</p>
  </li>
 </ul>
    
@@ -209,19 +209,6 @@ Du kannst auch eine kurze Nachricht hinzufügen.</p>
 <p>Der zweite Kontakt erhält dann die <strong>Kontaktdaten</strong> und
 kann darauf tippen, um mit dem ersten Kontakt zu chatten.</p>
    
-      <h3 id="unterstützt-delta-chat-bilder-videos-und-dateianhänge">
-        
-        
-          Unterstützt Delta Chat Bilder, Videos und Dateianhänge? <a href="#unterstützt-delta-chat-bilder-videos-und-dateianhänge" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>Ja. Bilder, Videos, Dateien, Sprachnachrichten und mehr können über die <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Anhang-</strong>
-  bzw. <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Sprachnachricht</strong>-Buttons hinzugefügt werden</p>
-
-<p>Um die Leistung zu verbessern, werden die Bilder standardmäßig optimiert und in einer kleineren Größe gesendet, aber du kannst sie auch als “Datei” senden, um das Original zu erhalten.</p>
-    
      <h3 id="multiple-accounts">
        
        
@@ -241,7 +228,7 @@ oder <strong>Profile zu wechseln</strong>.</p>

 <p>Du kannst separate Profile für politische, familiäre oder berufliche Aktivitäten verwenden.</p>

-<p>Vielleicht möchtest due auch erfahren, wie du <a href="#multiclient">Profile auf mehreren Geräten verwenden kannst</a>.</p>
+<p>Vielleicht möchtest du auch erfahren, wie du <a href="#multiclient">Profile auf mehreren Geräten verwenden kannst</a>.</p>
    
      <h3 id="wer-sieht-mein-profilbild">
        
@@ -279,7 +266,7 @@ Sobald du eine Nachricht an einen Kontakt sendest, kann dieser deine Signatur in

 <ul>
  <li>
-    <p><strong>Angeheftete Chats</strong> bleiben immer ganz oben in der Chatliste. So kannst du schnell auf deine Lieblingschats zugreifen oder du verwendest vorübergehend angeheftete Chats um Dinge nicht zu vergessen.</p>
+    <p><strong>Angeheftete Chats</strong> bleiben immer ganz oben in der Chatliste. So kannst du schnell auf deine Lieblingschats zugreifen oder du verwendest vorübergehend angeheftete Chats, um Dinge nicht zu vergessen.</p>
  </li>
  <li>
    <p><strong>Stummgeschaltete Chats</strong> erhalten keine Benachrichtigungen, bleiben ansonsten aber an ihrem Platz. Du kannst auch stummgeschaltete Chats anheften.</p>
@@ -292,7 +279,7 @@ Sobald du eine Nachricht an einen Kontakt sendest, kann dieser deine Signatur in
  </li>
 </ul>

-<p>Um die Funktionen zu nutzen, lang auf einen Chat in der Chatliste tippen oder den Chat mit der rechten Maustaste anklicken.</p>
+<p>Um die Funktionen zu nutzen, tippe lang auf einen Chat in der Chatliste oder klicke den Chat mit der rechten Maustaste an.</p>
    
      <h3 id="save">
        
@@ -302,11 +289,11 @@ Sobald du eine Nachricht an einen Kontakt sendest, kann dieser deine Signatur in
        
      </h3>

-<p><strong>Gespeicherte Nachrichten</strong> ist ein Chat, den du verwenden kannst, um dir Nachrichten zu merken und wiederzufinden.</p>
+<p><strong>Gespeicherte Nachrichten</strong> ist ein Chat, den du verwenden kannst, um dir Nachrichten zu merken und sie wiederzufinden.</p>

 <ul>
  <li>
-    <p>Tippen in einem beliebigen Chat lange auf eine Nachricht oder klicken mit der rechten Maustaste darauf und wähle <strong>Speichern</strong>.</p>
+    <p>Tippe im Chat lange auf eine Nachricht oder klicke mit der rechten Maustaste darauf und wähle <strong>Speichern</strong>.</p>
  </li>
  <li>
    <p>Gespeicherte Nachrichten werden mit dem Symbol
@@ -319,7 +306,7 @@ Durch Tippen auf <img style="vertical-align:middle; width:1.2em; margin:1px" src
 kannst du zu der ursprünglichen Nachricht im ursprünglichen Chat zurückkehren</p>
  </li>
  <li>
-    <p>Schließlich kannst du auch „Gespeicherte Nachrichten“ verwenden, um <strong>persönliche Notizen</strong> zu machen - öffnen den Chat, gib etwas ein, fügen ein Foto oder eine Sprachnachricht hinzu usw.</p>
+    <p>Schließlich kannst du auch „Gespeicherte Nachrichten“ verwenden, um <strong>persönliche Notizen</strong> zu machen. Öffne den Chat, gib etwas ein, fügen ein Foto oder eine Sprachnachricht hinzu usw.</p>
  </li>
  <li>
    <p>Da „Gespeicherte Nachrichten“ synchronisiert werden, können sie sehr praktisch für die Übertragung von Daten zwischen Geräten sein</p>
@@ -360,7 +347,7 @@ sei es durch den <a href="#edit">Absender</a>, durch <a href="#delold">Automatis

 <p>In <a href="#groups">Gruppen</a> bedeutet das zweite Häkchen, dass die Nachricht von mindestens einem Mitglied gelesen wurde.</p>

-<p>Du erhälst nur dann das zweite Häkchen, wenn sowohl du als auch einer der Empfänger, die die Nachricht gelesen haben, <strong>Einstellungen → Chats → Lesebestätigungen</strong> aktiviert haben.</p>
+<p>Du erhältst nur dann das zweite Häkchen, wenn sowohl du als auch einer der Empfänger, die die Nachricht gelesen haben, <strong>Einstellungen → Chats → Lesebestätigungen</strong> aktiviert haben.</p>
    
      <h3 id="edit">
        
@@ -388,6 +375,31 @@ Es werden keine Benachrichtigungen verschickt und es gibt kein Zeitlimit.</p>
 <p>Beachten, dass die ursprüngliche Nachricht dennoch von Chatteilnehmern empfangen worden sein könnte,
 die die Nachricht bereits beantwortet, weitergeleitet, gespeichert, mit einem Screenshot versehen oder anderweitig kopiert haben könnten.</p>
    
+      <h3 id="mediaquality">
+        
+        
+          Medienqualität und Datenverbrauch <a href="#mediaquality" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Bilder, Videos, Dateien, Sprachnachrichten und mehr können über die <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Anhang-</strong>
+  bzw. <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Sprachnachricht</strong>-Buttons hinzugefügt werden.</p>
+
+<ul>
+  <li>
+    <p>Standardmäßig sorgt Komprimierung für eine <strong>schnelle, effiziente Übertragung</strong>, die die Datenlimits und Speicherplatzkapazitäten aller Beteiligten berücksichtigt.
+Dies ist ideal für die tägliche Kommunikation.</p>
+  </li>
+  <li>
+    <p>In Regionen mit schlechter Verbindung können Sie unter <strong>Einstellungen → Chats →  Medienqualität beim Senden</strong> eine höhere Komprimierung wählen.</p>
+  </li>
+  <li>
+    <p>Wenn Sie Medien ausdrücklich in ihrer <strong>Originalqualität</strong> senden müssen, verwende im Chat die Option <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Anhängen → Datei</strong>.
+Verwende diese Methode nur sparsam, da das Senden von Originaldateien den Datenverbrauch für dich und alle Empfänger im Chat erheblich erhöht.</p>
+  </li>
+</ul>
+    
      <h3 id="ephemeralmsgs">
        
        
@@ -503,7 +515,7 @@ und seine <a href="#edit">eigenen Nachrichten von Geräten der Mitglieder lösch
    <p>Wenn das Mitglied noch nicht in deiner Kontaktliste ist, sie sich aber <strong>persönlich</strong> treffen, wählen Sie dort <strong>QR-Einladungscode</strong> an. Dein Chat-Partner kann nun den QR-Code mit seiner Delta Chat-App <strong>scannen</strong> indem er auf <img style="vertical-align:middle; height:1.3em; margin:1px" src="../qr-icon.png" /> auf dem Hauptbildschirm tippt.</p>
  </li>
  <li>
-    <p>Für eine Kontaktaufnahme <strong>aus der Ferne</strong>, tippe dort “Kopieren” oder “Teilen” und sende den Einladungslink über einen anderen privaten Chat zum neuen Mitglied.</p>
+    <p>Für eine Kontaktaufnahme <strong>aus der Ferne</strong> tippe dort “Kopieren” oder “Teilen” und sende den Einladungslink über einen anderen privaten Chat zum neuen Mitglied.</p>
  </li>
 </ul>

@@ -533,7 +545,7 @@ Kein Problem, bitte einfach ein anderes Gruppenmitglied in einem normalen Chat,
 Wenn du der Gruppe später erneut beitreten möchtest, bitten ein anderes Gruppenmitglied, dich hinzuzufügen.</li>
 </ul>

-<p>Alternativ kannst du eine Gruppe auch “stummschalten” - dies bedeutet, dass du weiterhin alle Nachrichten erhälst und neue schreiben kannst, aber nicht mehr über neue Nachrichten informiert wirst.</p>
+<p>Alternativ kannst du eine Gruppe auch “stummschalten” - dies bedeutet, dass du weiterhin alle Nachrichten erhältst und neue schreiben kannst, aber nicht mehr über neue Nachrichten informiert wirst.</p>
    
      <h3 id="eine-gruppe-klonen">
        
@@ -958,18 +970,16 @@ kannst du jedoch unter <strong>Einstellungen → Erweitert → Relays</strong>

 <ul>
  <li>
-    <p>Du kannst ein Relay <strong>hinzufügen</strong>, indem du einen QR-Code scannst,
-z.B. von <a href="https://chatmail.at/relays">https://chatmail.at/relays</a>.
-Bei mehreren Relays, empfängst du die Nachrichten von allen Relays.</p>
+    <p>Du kannst ein Relay <strong>hinzufügen</strong>, indem du einen QR-Code scannst, z.B. von <a href="https://chatmail.at/relays">chatmail.at/relays</a>. Bei mehreren Relays, empfängst du die Nachrichten von allen Relays. Deine Kontakte lernen deine Relays automatisch, sobald du ihnen schreibst.</p>
  </li>
  <li>
-    <p><strong>Standard</strong> legt das Relay fest, an das deine Chatpartner zukünftig Nachrichten senden.</p>
+    <p>Tippe ein Relay an, um es <strong>Zum Senden zu verwenden</strong></p>
  </li>
  <li>
-    <p>Wenn du ein Relay <strong>entfernst</strong>,
-stelle sicher, dass ein anderes Standard-Relay ausreichend lange verwendet wurde.
-Andernfalls erreichen dich keine Nachrichten von deinen Kontakten.
-Im Zweifelsfall entferne das Relay später.</p>
+    <p>Wenn du ein Relay <strong>entfernst</strong>, können Kontakte, die nur dieses Relay kennen, dich nicht erreichen, bis du ihnen wieder schreibst. Um erreichbar zu bleiben,  wähle <strong>Vor Kontakten verstecken</strong> im Bestätigungsdialog anstelle das Relay direkt zu löschen.</p>
+  </li>
+  <li>
+    <p>Um ein verstecktes Relay wieder <strong>anzuzeigen</strong> tippe es an.</p>
  </li>
 </ul>

@@ -1045,31 +1055,31 @@ für die <a href="https://chatmail.at/clients">Chatmail-Clients</a> umfasst, von
        
      </h3>

-<p>We would like to improve Delta Chat with your help,
-which is why Delta Chat for Android asks whether you want
-to send anonymous usage statistics.</p>
+<p>Wir möchten Delta Chat mit deiner Hilfe verbessern.
+Deshalb fragt Delta Chat für Android, ob du
+anonyme Nutzungsstatistiken senden möchtest.</p>

-<p>You can turn it on and off at
-<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
+<p>Du kannst dies unter
+<strong>Einstellungen → Erweitert → Statistik an Delta Chat Entwickler senden</strong> ein- und ausschalten.</p>

-<p>When you turn it on,
-weekly statistics will be automatically sent to a bot.</p>
+<p>Wenn eingeschaltet,
+werden wöchentlich Statistiken automatisch an einen Bot gesendet.</p>

-<p>We are interested e.g. in statistics like:</p>
+<p>Wir sind beispielsweise an folgenden Statistiken interessiert:</p>

 <ul>
  <li>
-    <p>How many contacts are introduced by personally scanning a QR code?</p>
+    <p>Wie viele Kontakte werden durch das persönliche Scannen eines QR-Codes hergestellt?</p>
  </li>
  <li>
-    <p>Which versions of Delta Chat are being used?</p>
+    <p>Welche Versionen von Delta Chat werden verwendet?</p>
  </li>
  <li>
-    <p>What errors occur for users?</p>
+    <p>Welche Fehler treten bei Benutzern auf?</p>
  </li>
 </ul>

-<p>We will <em>not</em> collect any personally identifiable information about you.</p>
+<p>Wir werden <em>keinerlei</em> personenbezogene Daten über dich sammeln.</p>
    
      <h3 id="ich-bin-an-technischen-details-interessiert-gibt-es-hierzu-weitere-infos">
        
@@ -1107,6 +1117,10 @@ zum Austausch von Verschlüsselungsinformationen durch Scannen von QR-Codes oder
  <li>
    <p><a href="https://autocrypt.org">Autocrypt</a> wird verwendet, um automatisch eine Ende-zu-Ende-Verschlüsselung zwischen Kontakten und allen Mitgliedern einer Gruppe herzustellen.</p>
  </li>
+  <li>
+    <p><a href="https://autocrypt2.org">Autocrypt v2</a>, dessen vollständige Implementierung für 2026 geplant ist, 
+wir post-quantum-resistente Verschlüsselung und Forward Secrecy einführen.</p>
+  </li>
  <li>
    <p><a href="https://github.com/chatmail/core/blob/main/spec.md#attaching-a-contact-to-a-message">Teilen eines Kontakts im Chat</a>
 ermöglicht es den Empfängern, eine Ende-zu-Ende-Verschlüsselung mit dem Kontakt zu verwenden.</p>
@@ -1280,15 +1294,13 @@ selbst wenn die Nachricht nicht Ende-zu-Ende-verschlüsselt war.</p>
 speichern Delta-Chat-Apps keine Metadaten über Kontakte oder Gruppen auf Servern. Auch nicht in verschlüsselter Form. 
 Stattdessen werden alle Gruppen-Metadaten durchgängig verschlüsselt und ausschließlich auf den Endgeräten der Nutzer gespeichert.</p>

-<p>Servers can therefore only see:</p>
+<p>Server können daher nur das folgende sehen:</p>

 <ul>
-  <li>the sender and receiver addresses</li>
-  <li>and the message size.</li>
+  <li>Absender- und Empfängeradressen, standardmäßig zufällig generiert</li>
+  <li>Größe der Nachricht</li>
 </ul>

-<p>By default, the addresses are randomly generated.</p>
-
 <p>Alle anderen Metadaten zu Nachrichten, Kontakten und Gruppen befinden sich im Ende-zu-Ende-verschlüsselten Teil der Nachrichten.</p>
    
      <h3 id="device-seizure">
@@ -1299,15 +1311,15 @@ Stattdessen werden alle Gruppen-Metadaten durchgängig verschlüsselt und aussch
        
      </h3>

-<p>Both for protecting against metadata-collecting servers 
-as well as against the threat of device seizure
-we recommend to use a <a href="https://chatmail.at/relays">chatmail relay</a>
-to create chat profiles using random addresses for transport. 
-Note that Delta Chat apps on all platforms support multiple profiles
-so you can easily use situation-specific profiles next to your “main” profile
-with the knowledge that all their data, along with all metadata, will be deleted.
-Moreover, if a device is seized then chat contacts using short-lived profiles
-can not be identified easily.</p>
+<p>Sowohl zum Schutz vor Servern, die Metadaten sammeln, 
+als auch als Schutz bei Beschlagnahmung von Geräten
+empfehlen wir die Verwendung eines <a href="https://chatmail.at/relays">Chatmail-Relays</a>,
+um Chat-Profile mit zufälligen Adressen für den Transport zu erstellen. 
+Beachte, dass Delta-Chat-Apps mehrere Profile unterstützen,
+sodass du neben deinem „Hauptprofil” ganz einfach situationsspezifische Profile verwenden kannst,
+mit der Gewissheit, dass alle Daten sowie alle Metadaten gelöscht werden.
+Darüber hinaus können Chat-Kontakte, die kurzlebige Profile verwenden,
+im Falle einer Beschlagnahmung des Geräts nicht ohne Weiteres identifiziert werden.</p>
    
      <h3 id="wer-sieht-meine-ip-adresse">
        
@@ -1350,11 +1362,10 @@ um seine Serverinfrastruktur darüber im Unklaren zu lassen, wer eine Nachricht
 Dies ist besonders wichtig, weil der Signal-Server die Handynummer jedes Kontos kennt,
 die in der Regel mit einer Passidentität verbunden ist.</p>

-<p>Even if <a href="https://chatmail.at/relays">chatmail relays</a> 
-do not ask for any private data (including no phone numbers), 
-it might still be worthwhile to protect relational metadata between addresses. 
-We don’t foresee bigger problems in using random throw-away addresses for sealed sending
-but an implementation has not been agreed as a priority yet.</p>
+<p>Auch wenn <a href="https://chatmail.at/relays">Chatmail-Relays</a> 
+keine privaten Daten (einschließlich Telefonnummern) abfragen, 
+könnte es dennoch sinnvoll sein, Metadaten zwischen Adressen zu schützen. 
+Wir sehen keine größeren Probleme bei der Verwendung von zufälligen Wegwerfadressen für aber eine Umsetzung wurde noch nicht als priorisiert.</p>
    
      <h3 id="pfs">
        
@@ -1364,23 +1375,20 @@ but an implementation has not been agreed as a priority yet.</p>
        
      </h3>

-<p>Nein, noch nicht.</p>
+<p>Noch nicht, aber es kommt mit <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

-<p>Delta Chat today doesn’t support Perfect Forward Secrecy (PFS).
-This means that if your private decryption key is leaked,
-and someone has collected your prior in-transit messages,
-they will be able to decrypt and read them using the leaked decryption key.
-Note that Forward Secrecy only increases security if you delete messages. 
-Otherwise, someone obtaining your decryption keys
-is typically also able to get all your non-deleted messages
-and doesn’t even need to decrypt any previously collected messages.</p>
+<p>Delta Chat unterstützt derzeit keine Perfect Forward Secrecy (PFS).
+Das bedeutet, dass, wenn Ihr privater Schlüssel offengelegt wird
+und jemand Ihre früheren Nachrichten während der Übertragung gesammelt hat,
+diese mit dem offengelegten Schlüssel entschlüsselt und gelesen werden können.
+Beachten Sie, dass Forward Secrecy die Sicherheit nur erhöht, wenn du Nachrichten löschst. 
+Andernfalls kann jemand, der deinen Schlüssel erhält,
+in der Regel auch alle deine nicht gelöschten Nachrichten abrufen
+und muss zuvor gesammelte Nachrichten nicht einmal entschlüsseln.</p>

-<p>We designed a Forward Secrecy approach that withstood 
-initial examination from some cryptographers and implementation experts 
-but is pending a more formal write up 
-to ascertain it reliably works in federated messaging and with multi-device usage,
-before it could be implemented in <a href="https://github.com/chatmail/core">chatmail core</a>,
-which would make it available in all <a href="https://chatmail.at/clients">chatmail clients</a>.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, dessen vollständige Implementierung für 2026 geplant ist,
+wird durch automatische Schlüsselrotation eine zuverlässige Löschung (Forward Secrecy) gewährleisten.
+Dieser Ansatz ist im Entwurf <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> festgelegt.</p>
    
      <h3 id="pqc">
        
@@ -1390,11 +1398,13 @@ which would make it available in all <a href="https://chatmail.at/clients">chatm
        
      </h3>

-<p>Nein, noch nicht.</p>
+<p>Noch nicht, aber es kommt mit <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

-<p>Delta Chat verwendet die Rust OpenPGP-Bibliothek <a href="https://github.com/rpgp/rpgp">rPGP</a>
-die den neuesten <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP Entwurf</a> unterstützt. 
-Wir beabsichtigen, PQC-Unterstützung zum <a href="https://github.com/chatmail/core">chatmail core</a> hinzuzufügen, sobald der Entwurf bei der IETF in Zusammenarbeit mit anderen OpenPGP-Implementierern fertiggestellt ist.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, dessen vollständige Implementierung für 2026 geplant ist,
+wird eine post-quantum-resistente Verschlüsselung zum Schutz vor Angriffen durch Quantencomputer bieten.
+Delta Chat verwendet die Rust-OpenPGP-Bibliothek <a href="https://github.com/rpgp/rpgp">rPGP</a>,
+die den neuesten <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Kryptografie OpenPGP Entfurf</a> unterstützt.
+Die Implementierung ist in <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> festgelegt.</p>
    
      <h3 id="wie-kann-ich-die-verschlüsselung-manuell-überprüfen">
        
@@ -1420,12 +1430,11 @@ ist die Verbindung sicher.</p>

 <p>Nein.</p>

-<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1.
-We do not recommend or offer users to perform manual key management.
-We want to ensure that security audits can focus on a few proven cryptographic algorithms
-instead of the full breadth of possible algorithms allowed with OpenPGP.
-If you want to extract your OpenPGP key, there only is an expert method:
-you need to look it up in the “keypairs” SQLite table of a profile backup tar-file.</p>
+<p>Delta Chat generiert sichere OpenPGP-Schlüssel gemäß der Autocrypt-Spezifikation 1.1.
+Wir bieten Benutzern keine manuelle Schlüsselverwaltung an, noch empfehlen diese.
+Wir wollen sicherstellen, dass sich Sicherheitsüberprüfungen auf einige wenige bewährte kryptografische Algorithmen konzentrieren können,
+anstatt auf die gesamte Bandbreite der mit OpenPGP zulässigen Algorithmen.
+Wenn Sie Ihren OpenPGP-Schlüssel extrahieren möchten, gibt es nur eine Methode für Experten: Sie müssen ihn in der SQLite-Tabelle „keypairs” des Backups nachschlagen.</p>
    
      <h3 id="security-audits">
        
@@ -1535,31 +1544,24 @@ Wir nutzen vielmehr öffentliche Finanzierungsquellen, die bisher aus der EU und

 <ul>
  <li>
-    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
-program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
-along with collaboration partners working on
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>,
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>,
-<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and
-<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>.
-All of these projects are partially completed or to be completed in early 2025.</p>
+    <p>2023 und 2024 wurden wir in das Next-Generation-Internet-Programm (NGI)
+für unsere Arbeit an <a href="https://nlnet.nl/project/WebXDC-Push/">Webxdc-PUSH</a> aufgenommen,
+zusammen mit Kooperationspartnern, die an 
+<a href="https://nlnet.nl/project/Webxdc-Evolve/">Webxdc-Evolve</a>, 
+<a href="https://nlnet.nl/project/WebXDC-XMPP/">Webxdc-XMPP</a>, 
+<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> und 
+<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>. 
+Alle diese Projekte sind teilweise abgeschlossen oder sollen Anfang 2025 abgeschlossen werden.</p>
  </li>
  <li>
    <p>Im Jahr 2021 erhielten wir weitere EU-Mittel für zwei “Next-Generation-Internet”-Anträge, nämlich für <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - E-Mail-Provider-Portabilitätsverzeichnis</a> (~97K EUR) und <a href="https://nlnet.nl/project/EmailPorting/">AEAP - E-Mail-Adressportierung</a> (~90K EUR). Ziel sind bessere Unterstützung von Mehrfachkonten, verbesserten QR-Code-Kontakt- und -Gruppen-Setups sowie Netzwerkverbesserungen auf allen Plattformen.</p>
  </li>
  <li>
-    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
-completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
+    <p>Die <a href="https://nlnet.nl/">NLnet-Stiftung</a> bewilligte 2019/2020 46K  EUR für die Fertigstellung von Rust-/Python-Bindungs und die Einrichtung eines Chat-Bot-Ökosystems.</p>
  </li>
  <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p>Der <a href="https://opentechfund.org">Open Technology Fund</a> hat Delta Chat erstmals 2018/2019 bezuschusst; mit dieser Förderung (~$200K) wurden hauptsächlich die Android-App verbessert sowie das Release der Desktop-App in einer Betaversion ermöglicht. Basierend auf Nutzererfahrungen im Menschenrechtskontext wurden zudem verschiedene Funktionen entwickelt, siehe unseren Bericht <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
+Die zweite Förderung 2019/2020 (~$300K) half uns bei der  Erstellung der iOS-Version, unsere Kernbibliothek in die Programmiersprache “Rust” zu konvertieren und neue Funktionen für alle Plattformen bereitzustellen.</p>
  </li>
  <li>
    <p>Das EU-Projekt <a href="https://nextleap.eu">NEXTLEAP</a> finanzierte 2017 und 2018 die Entwicklung und Implementierung von “Verifizierten Gruppen” und “Setup Kontakt” und half auch bei der Integration der Ende-zu-Ende-Verschlüsselung durch <a href="https://autocrypt.org">Autocrypt</a>.</p>
@@ -5,7 +5,6 @@
      <li><a href="#howtoe2ee">How can I find people to chat with?</a></li>
      <li><a href="#why-is-a-chat-marked-as-request">Why is a chat marked as “Request”?</a></li>
      <li><a href="#how-can-i-put-two-of-my-friends-in-contact-with-each-other">How can I put two of my friends in contact with each other?</a></li>
-      <li><a href="#does-delta-chat-support-images-videos-and-other-attachments">Does Delta Chat support images, videos and other attachments?</a></li>
      <li><a href="#multiple-accounts">What are profiles? How can I switch between them?</a></li>
      <li><a href="#who-sees-my-profile-picture">Who sees my profile picture?</a></li>
      <li><a href="#signature">Can I set a Bio/Status with Delta Chat?</a></li>
@@ -14,6 +13,7 @@
      <li><a href="#what-does-the-green-dot-mean">What does the green dot mean?</a></li>
      <li><a href="#what-do-the-ticks-shown-beside-outgoing-messages-mean">What do the ticks shown beside outgoing messages mean?</a></li>
      <li><a href="#edit">Correct typos and delete messages after sending</a></li>
+      <li><a href="#mediaquality">How is media quality handled?</a></li>
      <li><a href="#ephemeralmsgs">How do disappearing messages work?</a></li>
      <li><a href="#delold">What happens if I turn on “Delete Messages from Device”?</a></li>
      <li><a href="#remove-account">How can I delete my chat profile?</a></li>
@@ -218,19 +218,6 @@ You can also add a little introduction message.</p>
 <p>The second contact will receive a <strong>card</strong> then
 and can tap it to start chatting with the first contact.</p>
    
-      <h3 id="does-delta-chat-support-images-videos-and-other-attachments">
-        
-        
-          Does Delta Chat support images, videos and other attachments? <a href="#does-delta-chat-support-images-videos-and-other-attachments" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
-or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>For performance, images are optimized and sent at a smaller size by default, but you can send it as a “file” to preserve the original.</p>
-    
      <h3 id="multiple-accounts">
        
        
@@ -411,6 +398,32 @@ Notifications are not sent and there is no time limit.</p>
 <p>Note, that the original message may still be received by chat members
 who could have already replied, forwarded, saved, screenshotted or otherwise copied the message.</p>
    
+      <h3 id="mediaquality">
+        
+        
+          How is media quality handled? <a href="#mediaquality" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach-</strong>
+or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons.</p>
+
+<ul>
+  <li>
+    <p>By default, compression ensures <strong>fast, efficient delivery</strong> that respects everyone’s data limits and storage.
+This is ideal for everyday communication.</p>
+  </li>
+  <li>
+    <p>In regions with worse connectivity,
+you can choose higher compression at <strong>Settings → Chats → Outgoing Media Quality</strong>.</p>
+  </li>
+  <li>
+    <p>If you specifically need to send media in its <strong>original quality</strong>, use <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach → File</strong> in the chat.
+Please use this method sparingly, as sending original files will significantly increase data usage for you and all recipients in the chat.</p>
+  </li>
+</ul>
+    
      <h3 id="ephemeralmsgs">
        
        
@@ -1030,22 +1043,26 @@ Relays are operated by different groups and people.</p>
 <p>By default, after installation, a relay is <strong>automatically set up</strong>,
 so you do not need to care about that.
 However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+you can configure relays at <strong>Settings → Advanced → Relays</strong>:</p>

 <ul>
  <li>
    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
+<a href="https://chatmail.at/relays">chatmail.at/relays</a> shows some known ones.
+If you have multiple relays, you will receive messages on all of them.
+Contacts learn your current relays automatically when you message them.</p>
  </li>
  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
+    <p>Tap on a relay to set it as <strong>used for sending</strong>.</p>
  </li>
  <li>
    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
+contacts who only know this relay may not reach you until you message them again.
+To stay reachable in the meantime, choose <strong>Hide from Contacts</strong> in the confirmation dialog
+instead of removing it right away.</p>
+  </li>
+  <li>
+    <p>To <strong>show</strong> a hidden relay again, tap on it.</p>
  </li>
 </ul>

@@ -1188,6 +1205,10 @@ to exchange encryption setup information through QR-code scanning or “invite l
  <li>
    <p><a href="https://autocrypt.org">Autocrypt</a> is used for automatically
 establishing end-to-end encryption between contacts and all members of a group chat.</p>
+  </li>
+  <li>
+    <p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026, 
+will bring post-quantum resistant encryption and forward secrecy.</p>
  </li>
  <li>
    <p><a href="https://github.com/chatmail/core/blob/main/spec.md#attaching-a-contact-to-a-message">Sharing a contact to a
@@ -1372,12 +1393,10 @@ Instead, all group metadata is end-to-end encrypted and stored on end-user devic
 <p>Servers can therefore only see:</p>

 <ul>
-  <li>the sender and receiver addresses</li>
-  <li>and the message size.</li>
+  <li>Sender and receiver addresses, randomly generated by default</li>
+  <li>Message size</li>
 </ul>

-<p>By default, the addresses are randomly generated.</p>
-
 <p>All other message, contact and group metadata resides in the end-to-end encrypted part of messages.</p>
    
      <h3 id="device-seizure">
@@ -1453,7 +1472,7 @@ but an implementation has not been agreed as a priority yet.</p>
        
      </h3>

-<p>No, not yet.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

 <p>Delta Chat today doesn’t support Perfect Forward Secrecy (PFS).
 This means that if your private decryption key is leaked,
@@ -1464,12 +1483,9 @@ Otherwise, someone obtaining your decryption keys
 is typically also able to get all your non-deleted messages
 and doesn’t even need to decrypt any previously collected messages.</p>

-<p>We designed a Forward Secrecy approach that withstood 
-initial examination from some cryptographers and implementation experts 
-but is pending a more formal write up 
-to ascertain it reliably works in federated messaging and with multi-device usage,
-before it could be implemented in <a href="https://github.com/chatmail/core">chatmail core</a>,
-which would make it available in all <a href="https://chatmail.at/clients">chatmail clients</a>.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will provide reliable deletion (forward secrecy) through automatic key rotation.
+This approach is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="pqc">
        
@@ -1479,12 +1495,13 @@ which would make it available in all <a href="https://chatmail.at/clients">chatm
        
      </h3>

-<p>No, not yet.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

-<p>Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
-which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>. 
-We aim to add PQC support in <a href="https://github.com/chatmail/core">chatmail core</a>  after the draft is finalized at the IETF
-in collaboration with other OpenPGP implementers.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will bring post-quantum resistant encryption to protect against quantum computer attacks.
+Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
+which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>.
+The implementation is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="how-can-i-manually-check-encryption-information">
        
@@ -5,7 +5,6 @@
      <li><a href="#howtoe2ee">How can I find people to chat with?</a></li>
      <li><a href="#why-is-a-chat-marked-as-request">Why is a chat marked as “Request”?</a></li>
      <li><a href="#how-can-i-put-two-of-my-friends-in-contact-with-each-other">How can I put two of my friends in contact with each other?</a></li>
-      <li><a href="#delta-chat-soporta-envío-de-imágenes-videos-documentos-y-otros-archivos">¿Delta Chat soporta envío de imágenes, videos, documentos y otros archivos?</a></li>
      <li><a href="#multiple-accounts">¿Qué son los perfiles? ¿Cómo puedo cambiar entre ellos?</a></li>
      <li><a href="#quién-ve-mi-foto-de-perfil">¿Quién ve mi foto de perfil?</a></li>
      <li><a href="#signature">Can I set a Bio/Status with Delta Chat?</a></li>
@@ -14,6 +13,7 @@
      <li><a href="#qué-significa-el-punto-verde">¿Qué significa el punto verde?</a></li>
      <li><a href="#qué-significan-las-marcas-que-se-muestran-junto-a-los-mensajes-salientes">¿Qué significan las marcas que se muestran junto a los mensajes salientes?</a></li>
      <li><a href="#edit">Corregir errores y borrar mensajes después de enviar</a></li>
+      <li><a href="#mediaquality">How is media quality handled?</a></li>
      <li><a href="#ephemeralmsgs">¿Cómo funciona la desaparición de mensajes?</a></li>
      <li><a href="#delold">¿Qué pasa si activo “Borrar mensajes del dispositivo”?</a></li>
      <li><a href="#remove-account">How can I delete my chat profile?</a></li>
@@ -216,19 +216,6 @@ You can also add a little introduction message.</p>
 <p>The second contact will receive a <strong>card</strong> then
 and can tap it to start chatting with the first contact.</p>
    
-      <h3 id="delta-chat-soporta-envío-de-imágenes-videos-documentos-y-otros-archivos">
-        
-        
-          ¿Delta Chat soporta envío de imágenes, videos, documentos y otros archivos? <a href="#delta-chat-soporta-envío-de-imágenes-videos-documentos-y-otros-archivos" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
-or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>Para mejorar el rendimiento, las imágenes se optimizan y se envían en un tamaño más pequeño de forma predeterminada, pero puedes enviarla como un “archivo” para conservar la original.</p>
-    
      <h3 id="multiple-accounts">
        
        
@@ -407,6 +394,32 @@ No se envían notificaciones y no hay límite de tiempo.</p>
 <p>Note, that the original message may still be received by chat members
 who could have already replied, forwarded, saved, screenshotted or otherwise copied the message.</p>
    
+      <h3 id="mediaquality">
+        
+        
+          How is media quality handled? <a href="#mediaquality" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach-</strong>
+or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons.</p>
+
+<ul>
+  <li>
+    <p>By default, compression ensures <strong>fast, efficient delivery</strong> that respects everyone’s data limits and storage.
+This is ideal for everyday communication.</p>
+  </li>
+  <li>
+    <p>In regions with worse connectivity,
+you can choose higher compression at <strong>Settings → Chats → Outgoing Media Quality</strong>.</p>
+  </li>
+  <li>
+    <p>If you specifically need to send media in its <strong>original quality</strong>, use <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach → File</strong> in the chat.
+Please use this method sparingly, as sending original files will significantly increase data usage for you and all recipients in the chat.</p>
+  </li>
+</ul>
+    
      <h3 id="ephemeralmsgs">
        
        
@@ -1026,22 +1039,26 @@ Relays are operated by different groups and people.</p>
 <p>By default, after installation, a relay is <strong>automatically set up</strong>,
 so you do not need to care about that.
 However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+you can configure relays at <strong>Settings → Advanced → Relays</strong>:</p>

 <ul>
  <li>
    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
+<a href="https://chatmail.at/relays">chatmail.at/relays</a> shows some known ones.
+If you have multiple relays, you will receive messages on all of them.
+Contacts learn your current relays automatically when you message them.</p>
  </li>
  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
+    <p>Tap on a relay to set it as <strong>used for sending</strong>.</p>
  </li>
  <li>
    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
+contacts who only know this relay may not reach you until you message them again.
+To stay reachable in the meantime, choose <strong>Hide from Contacts</strong> in the confirmation dialog
+instead of removing it right away.</p>
+  </li>
+  <li>
+    <p>To <strong>show</strong> a hidden relay again, tap on it.</p>
  </li>
 </ul>

@@ -1184,6 +1201,10 @@ to exchange encryption setup information through QR-code scanning or “invite l
  <li>
    <p><a href="https://autocrypt.org">Autocrypt</a> is used for automatically
 establishing end-to-end encryption between contacts and all members of a group chat.</p>
+  </li>
+  <li>
+    <p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026, 
+will bring post-quantum resistant encryption and forward secrecy.</p>
  </li>
  <li>
    <p><a href="https://github.com/chatmail/core/blob/main/spec.md#attaching-a-contact-to-a-message">Sharing a contact to a
@@ -1365,12 +1386,10 @@ Instead, all group metadata is end-to-end encrypted and stored on end-user devic
 <p>Servers can therefore only see:</p>

 <ul>
-  <li>the sender and receiver addresses</li>
-  <li>and the message size.</li>
+  <li>Sender and receiver addresses, randomly generated by default</li>
+  <li>Message size</li>
 </ul>

-<p>By default, the addresses are randomly generated.</p>
-
 <p>All other message, contact and group metadata resides in the end-to-end encrypted part of messages.</p>
    
      <h3 id="device-seizure">
@@ -1446,7 +1465,7 @@ but an implementation has not been agreed as a priority yet.</p>
        
      </h3>

-<p>No, not yet.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

 <p>Delta Chat today doesn’t support Perfect Forward Secrecy (PFS).
 This means that if your private decryption key is leaked,
@@ -1457,12 +1476,9 @@ Otherwise, someone obtaining your decryption keys
 is typically also able to get all your non-deleted messages
 and doesn’t even need to decrypt any previously collected messages.</p>

-<p>We designed a Forward Secrecy approach that withstood 
-initial examination from some cryptographers and implementation experts 
-but is pending a more formal write up 
-to ascertain it reliably works in federated messaging and with multi-device usage,
-before it could be implemented in <a href="https://github.com/chatmail/core">chatmail core</a>,
-which would make it available in all <a href="https://chatmail.at/clients">chatmail clients</a>.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will provide reliable deletion (forward secrecy) through automatic key rotation.
+This approach is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="pqc">
        
@@ -1472,12 +1488,13 @@ which would make it available in all <a href="https://chatmail.at/clients">chatm
        
      </h3>

-<p>No, not yet.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

-<p>Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
-which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>. 
-We aim to add PQC support in <a href="https://github.com/chatmail/core">chatmail core</a>  after the draft is finalized at the IETF
-in collaboration with other OpenPGP implementers.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will bring post-quantum resistant encryption to protect against quantum computer attacks.
+Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
+which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>.
+The implementation is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="how-can-i-manually-check-encryption-information">
        
@@ -2,27 +2,27 @@
 <html lang="fr"><head><meta charset="UTF-8" /><meta name="viewport" content="initial-scale=1.0" /><link rel="stylesheet" href="../help.css" /></head><body><ul id="top">
  <li><a href="#quest-ce-que-delta-chat-">Qu’est-ce que Delta Chat ?</a>
    <ul>
-      <li><a href="#howtoe2ee">How can I find people to chat with?</a></li>
-      <li><a href="#why-is-a-chat-marked-as-request">Why is a chat marked as “Request”?</a></li>
-      <li><a href="#how-can-i-put-two-of-my-friends-in-contact-with-each-other">How can I put two of my friends in contact with each other?</a></li>
-      <li><a href="#delta-chat-prend-il-en-charge-les-images-vidéos-et-autres-pièces-jointes-">Delta Chat prend-il en charge les images, vidéos et autres pièces jointes ?</a></li>
-      <li><a href="#multiple-accounts">What are profiles? How can I switch between them?</a></li>
+      <li><a href="#howtoe2ee">Comment trouver des personnes avec qui discuter ?</a></li>
+      <li><a href="#pourquoi-une-discussion-est-marquée-comme-invitation-">Pourquoi une discussion est marquée comme “invitation” ?</a></li>
+      <li><a href="#comment-mettre-deux-personnes-en-relation-entre-elles-">Comment mettre deux personnes en relation entre elles ?</a></li>
+      <li><a href="#multiple-accounts">À quoi correspondent les profils ? Comment est-ce que je peux passer de l’un à l’autre ?</a></li>
      <li><a href="#qui-peut-voir-ma-photo-de-profil-">Qui peut voir ma photo de profil ?</a></li>
-      <li><a href="#signature">Can I set a Bio/Status with Delta Chat?</a></li>
+      <li><a href="#signature">Est-il possible de définir une Bio/un Statut avec Delta Chat ?</a></li>
      <li><a href="#que-signifient-épingler-sourdine-et-archiver-">Que signifient “épingler”, “sourdine” et “archiver” ?</a></li>
-      <li><a href="#save">How do “Saved Messages” work?</a></li>
+      <li><a href="#save">Comment fonctionnent les “Messages enregistrés” ?</a></li>
      <li><a href="#que-signifie-le-point-vert-">Que signifie le point vert ?</a></li>
      <li><a href="#que-signifient-les-coches-affichées-à-côté-des-messages-sortants-">Que signifient les coches affichées à côté des messages sortants ?</a></li>
-      <li><a href="#edit">Correct typos and delete messages after sending</a></li>
-      <li><a href="#ephemeralmsgs">How do disappearing messages work?</a></li>
+      <li><a href="#edit">Corriger des fautes et supprimer des messages après les avoir envoyés</a></li>
+      <li><a href="#mediaquality">Comment est gérée la qualité des médias envoyés ?</a></li>
+      <li><a href="#ephemeralmsgs">Comment fonctionnent les messages éphémères ?</a></li>
      <li><a href="#delold">Que se passe-t-il si j’active l’option “Supprimer les anciens messages de l’appareil” ?</a></li>
-      <li><a href="#remove-account">How can I delete my chat profile?</a></li>
+      <li><a href="#remove-account">Comment puis-je supprimer un profil de discussion ?</a></li>
    </ul>
  </li>
-  <li><a href="#groups">Groups</a>
+  <li><a href="#groups">Groupes</a>
    <ul>
      <li><a href="#création-dun-groupe">Création d’un groupe</a></li>
-      <li><a href="#addmembers">Add and remove members</a></li>
+      <li><a href="#addmembers">Ajouter et supprimer des membres</a></li>
      <li><a href="#jai-quitté-un-groupe-par-accident">J’ai quitté un groupe par accident.</a></li>
      <li><a href="#je-ne-souhaite-plus-recevoir-les-messages-dun-groupe">Je ne souhaite plus recevoir les messages d’un groupe.</a></li>
      <li><a href="#cloning-a-group">Cloning a group</a></li>
@@ -105,90 +105,71 @@
        
      </h2>

-<p>Delta Chat is a reliable, decentralized and secure instant messaging app,
-available for mobile and desktop platforms.</p>
+<p>Delta Chat est une application de messagerie fiable, décentralisée et sécurisée, disponible pour smartphones et ordinateurs de bureau.</p>

 <ul>
  <li>
-    <p>Instant creation of <strong>private chat profiles</strong>
-with secure and interoperable <a href="https://chatmail.at/relays">chatmail relays</a>
-that offer instant message delivery, and Push Notifications for iOS and Android devices.</p>
+    <p>Création à la volée de <strong>profils de discussion privés</strong> grâce à des <a href="https://chatmail.at/relays">relais chatmail</a> sécurisés et interopérables qui permettent des échanges instantanés et des notifications Push pour les appareils iOS et Android.</p>
  </li>
  <li>
-    <p>Pervasive <a href="#multiple-accounts">multi-profile</a> and
-<a href="#multiclient">multi-device</a> support on all platforms
-and between different <a href="https://chatmail.at/clients">chatmail apps</a>.</p>
+    <p>Fonctionne en <a href="#multiple-accounts">multi-profils</a> et <a href="#multiclient">multi-appareils</a> sur toutes les plateformes et quelque soit <a href="https://chatmail.at/clients">l’application chatmail</a> utilisée.</p>
  </li>
  <li>
-    <p>Interactive <a href="#webxdc">in-chat apps</a> for gaming and collaboration</p>
+    <p><a href="#webxdc">Applications</a> interactives permettant de jouer et collaborer au sein des discussions.</p>
  </li>
  <li>
-    <p><a href="#security-audits">Audited end-to-end encryption</a>
-safe against network and server attacks.</p>
+    <p><a href="#security-audits">Chiffrement de bout-en-bout audité</a> protégé contre les attaques réseaux et de serveurs.</p>
  </li>
  <li>
-    <p>Free and Open Source software, both app and server side,
-built on <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Internet Standards</a>.</p>
+    <p>Logiciel libre et gratuit, autant côté serveur que côté application, développé autour des <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">standards d’internet</a>.</p>
  </li>
 </ul>
    
      <h3 id="howtoe2ee">
        
        
-          How can I find people to chat with? <a href="#howtoe2ee" class="anchor"></a>
+          Comment trouver des personnes avec qui discuter ? <a href="#howtoe2ee" class="anchor"></a>
        
        
      </h3>

-<p>First, note that Delta Chat is a private messenger.
-There is no public discovery, <em>you</em> decide about your contacts.</p>
+<p>Delta Chat est une application de messagerie privée. Il n’y a pas de mécanisme de découverte publique des utilisateurs et utilisatrices. <em>Vous</em> décidez avec qui vous échangez dans Delta Chat.</p>

 <ul>
  <li>
-    <p>If you are <strong>face to face</strong> with your friend or family,
-tap the <strong>QR Code</strong> icon <img style="vertical-align:middle; height:1.3em; margin:1px" src="../qr-icon.png" />
-on the main screen.<br />
-Ask your chat partner to <strong>scan</strong> the QR image
-with their Delta Chat app.</p>
+    <p>En <strong>présence physique</strong> de vos amis ou de membres de votre famille, appuyez sur l’icône <strong>QR code</strong> <img style="vertical-align:middle; height:1.3em; margin:1px" src="../qr-icon.png" /> sur l’écran principal. Demandez à votre contact de <strong>scanner</strong> le QR code avec leur application Delta Chat.</p>
  </li>
  <li>
-    <p>For a <strong>remote</strong> contact setup,
-from the same screen,
-click “Copy” or “Share” and send the <strong>invite link</strong>
-through another private chat.</p>
+    <p>Pour la mise en place d’un échange <strong>à distance</strong>, cliquez sur l’icône <strong>QR code</strong> sur l’écran principal, puis sur le bouton “Lien”, puis sur “Copier” ou “Partager” et envoyez le lien d’invitation via une autre messagerie privée.</p>
  </li>
 </ul>

-<p>Now wait while connection gets established.</p>
+<p>Il suffit ensuite d’attendre que la connexion soit établie.</p>

 <ul>
  <li>
-    <p>If both sides are online, they will soon see a chat
-and can start messaging securely.</p>
+    <p>Si les deux contacts sont en ligne, ils verront rapidement apparaître une nouvelle discussion et pourront tout de suite commencer une discussion sécurisée.</p>
  </li>
  <li>
-    <p>If one side is offline or in bad network,
-the ability to chat is delayed until connectivity is restored.</p>
+    <p>Si l’un des contacts n’est pas en ligne ou a des problèmes de réseau, la possibilité de démarrer la discussion aura lieu dès que la connectivité sera rétablie.</p>
  </li>
 </ul>

-<p>Congratulations!
-You now will automatically use <a href="#e2ee">end-to-end encryption</a> with this contact.
-If you add each other to <a href="#groups">groups</a>, end-to-end encryption will be established among all members.</p>
+<p>Félicitations !
+Vous utiliserez désormais le <a href="#e2ee">chiffrement de bout-en-bout</a> avec ce contact.
+Si vous vous ajoutez à des discussions de <a href="#groups">groupe</a> le chiffrement de bout-en-bout sera établi entre tous les membres de la discussion.</p>
    
-      <h3 id="why-is-a-chat-marked-as-request">
+      <h3 id="pourquoi-une-discussion-est-marquée-comme-invitation-">
        
        
-          Why is a chat marked as “Request”? <a href="#why-is-a-chat-marked-as-request" class="anchor"></a>
+          Pourquoi une discussion est marquée comme “invitation” ? <a href="#pourquoi-une-discussion-est-marquée-comme-invitation-" class="anchor"></a>
        
        
      </h3>

-<p>As being a private messenger,
-only friends and family you <a href="#howtoe2ee">share your QR code or invite link with</a> can write to you.</p>
+<p>Delta Chat étant une messagerie privée, seules les personnes avec qui vous <a href="#howtoe2ee">partagez votre QR code ou lien d’invitation</a> peuvent vous écrire.</p>

-<p>Your friends may share your contact with other friends,
-this appears as <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Request</b></p>
+<p>Vos contacts peuvent cependant partager votre profil avec d’autres personnes, ce qui apparaît alors comme une <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">invitation</b>.</p>

 <ul>
  <li>
@@ -204,53 +185,37 @@ recevoir de messages de cette personne, nous vous conseillons de la <strong>bloq
  </li>
 </ul>
    
-      <h3 id="how-can-i-put-two-of-my-friends-in-contact-with-each-other">
+      <h3 id="comment-mettre-deux-personnes-en-relation-entre-elles-">
        
        
-          How can I put two of my friends in contact with each other? <a href="#how-can-i-put-two-of-my-friends-in-contact-with-each-other" class="anchor"></a>
+          Comment mettre deux personnes en relation entre elles ? <a href="#comment-mettre-deux-personnes-en-relation-entre-elles-" class="anchor"></a>
        
        
      </h3>

-<p>Attach the first contact to the chat of the second using <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment Button → Contact</strong>.
-You can also add a little introduction message.</p>
+<p>Joignez le premier contact à votre discussion avec le second en utilisant <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Bouton pièce jointe → Contact</strong>.
+Profitez-en pour ajouter un message de présentation.</p>

-<p>The second contact will receive a <strong>card</strong> then
-and can tap it to start chatting with the first contact.</p>
-    
-      <h3 id="delta-chat-prend-il-en-charge-les-images-vidéos-et-autres-pièces-jointes-">
-        
-        
-          Delta Chat prend-il en charge les images, vidéos et autres pièces jointes ? <a href="#delta-chat-prend-il-en-charge-les-images-vidéos-et-autres-pièces-jointes-" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>Oui. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
-or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>Pour améliorer les performances, les images sont redimensionnées et envoyées en taille réduite par défaut ; mais vous pouvez les envoyer en tant que “fichier” pour en conserver la taille originale.</p>
+<p>Le deuxième contact recevra une <strong>carte</strong> qu’il pourra cliquer pour commencer une discussion avec le premier.</p>
    
      <h3 id="multiple-accounts">
        
        
-          What are profiles? How can I switch between them? <a href="#multiple-accounts" class="anchor"></a>
+          À quoi correspondent les profils ? Comment est-ce que je peux passer de l’un à l’autre ? <a href="#multiple-accounts" class="anchor"></a>
        
        
      </h3>

-<p>A profile is <strong>a name, a picture</strong> and some additional information for encrypting messages.
-A profile lives on your device(s) only
-and uses the server only to relay messages.</p>
+<p>Un profil est <strong>un nom, une photo</strong> et quelques informations supplémentaires pour chiffrer des messages.
+Un profil n’est présent que sur votre appareil/vos appareils et utilise le serveur seulement pour relayer les messages vers vos contacts.</p>

-<p>On first installation of Delta Chat a first profile is created.</p>
+<p>Lors de la première installation de Delta Chat un premier profil est créé.</p>

-<p>Later, you can tap your profile image in the upper left corner to <strong>Add Profiles</strong>
-or to <strong>Switch Profiles</strong>.</p>
+<p>Par la suite vous pourrez cliquer sur votre image de profil en haut à gauche de l’écran principal pour <strong>Ajouter un profil</strong> ou <strong>Changer de profil</strong>.</p>

-<p>You may want to use separate profiles for political, family or work related activities.</p>
+<p>Vous souhaiterez peut être utiliser des profils différents pour vos activités familiales, professionnelles ou politiques.</p>

-<p>You may also wish to learn <a href="#multiclient">how to use the same profile on multiple devices</a>.</p>
+<p>Vous souhaiterez peut être aussi apprendre <a href="#multiclient">comment utiliser le même profil sur plusieurs appareils</a>.</p>
    
      <h3 id="qui-peut-voir-ma-photo-de-profil-">
        
@@ -267,15 +232,13 @@ or to <strong>Switch Profiles</strong>.</p>
      <h3 id="signature">
        
        
-          Can I set a Bio/Status with Delta Chat? <a href="#signature" class="anchor"></a>
+          Est-il possible de définir une Bio/un Statut avec Delta Chat ? <a href="#signature" class="anchor"></a>
        
        
      </h3>

-<p>Yes,
-you can do so under <strong>Settings → Profile → Bio</strong>.
-Once you sent a message to a contact,
-they will see it when they view your contact details.</p>
+<p>Oui, vous pouvez le faire dans <strong>Paramètres → Profil → Signature</strong>.
+À partir du moment ou vous échangez avec quelqu’un, cette personne pourra voir votre Signature en regardant les détails de votre profil.</p>
    
      <h3 id="que-signifient-épingler-sourdine-et-archiver-">
        
@@ -309,37 +272,33 @@ pour mettre une discussion en sourdine, ouvrez le menu de la conversation (Andro
      <h3 id="save">
        
        
-          How do “Saved Messages” work? <a href="#save" class="anchor"></a>
+          Comment fonctionnent les “Messages enregistrés” ? <a href="#save" class="anchor"></a>
        
        
      </h3>

-<p><strong>Saved Messages</strong> is a chat that you can use to easily remember and find messages.</p>
+<p><strong>Messages enregistrés</strong> est une discussion que vous pouvez utiliser pour sauvegarder et retrouver facilement des messages.</p>

 <ul>
  <li>
-    <p>In any chat, long tap or right click a message and select <strong>Save</strong></p>
+    <p>Dans n’importe quelle discussion, touchez <img style="vertical-align:middle; width:1.2em; margin:1px;" src="../saved-icon.png" alt="Saved icon" /> ou faites un clic droit sur un message et sélectionnez <strong>Enregistrer</strong>.</p>
  </li>
  <li>
-    <p>Saved messages are marked by the symbol
-<img style="vertical-align:middle; width:1.2em; margin:1px" src="../saved-icon.png" alt="Saved icon" />
-next to the timestamp</p>
+    <p>Les messages enregistrés sont identifiés par le symbole <img style="vertical-align:middle; width:1.2em; margin:1px" src="../saved-icon.png" alt="Saved icon" /> à côté de l’horodatage du message.</p>
  </li>
  <li>
-    <p>Later, open the “Saved Messages” chat - and you will see the saved messages there.
-By tapping <img style="vertical-align:middle; width:1.2em; margin:1px" src="../go-to-original.png" alt="Arrow-right icon" />,
-you can go back to the original message in the original chat</p>
+    <p>Par la suite vous pourrez retrouver tous ces messages dans la discussion “Messages enregistrés”.
+En touchant <img style="vertical-align:middle; width:1.2em; margin:1px" src="../go-to-original.png" alt="Arrow-right icon" /> vous retrouverez le message dans sa discussion d’origine.</p>
  </li>
  <li>
-    <p>Finally, you can also use “Saved Messages” to take <strong>personal notes</strong> - open the chat, type something, add a photo or a voice message etc.</p>
+    <p>Enfin vous pouvez aussi utiliser la discussion “Messages enregistrés” pour prendre des <strong>notes privées</strong> - ouvrez la discussion, écrivez votre message, ajoutez une photo, un message vocal, etc.</p>
  </li>
  <li>
-    <p>As “Saved Message” are synced, they can become very handy for transferring data between devices</p>
+    <p>La discussion “Messages enregistrés” étant synchronisée elle peut être très pratique pour transférer des informations d’un appareil à un autre.</p>
  </li>
 </ul>

-<p>Messages stay saved even if they are edited or deleted -
-may it be by <a href="#edit">sender</a>, by <a href="#delold">device cleanup</a> or by <a href="#ephemeralmsgs">disappearing messages of other chats</a>.</p>
+<p>Les messages restent enregistrés même lorsqu’ils sont édités ou supprimés, que ça soit par <a href="#edit">l’expéditeur⋅rice</a>, par <a href="#delold">suppression des anciens messages de l’appareil</a> ou par <a href="#ephemeralmsgs">disparition des messages éphémères au sein d’une discussion</a>.</p>
    
      <h3 id="que-signifie-le-point-vert-">
        
@@ -349,13 +308,10 @@ may it be by <a href="#edit">sender</a>, by <a href="#delold">device cleanup</a>
        
      </h3>

-<p>You can sometimes see a <strong>green dot</strong> <img style="vertical-align:middle; width:1.2em; margin:1px" src="../green-dot.png" alt="" />
-next to the avatar of a contact.
-It means they were <strong>recently seen by you</strong> in the last 10 minutes,
-e.g. because they messaged you or sent a read receipt.</p>
+<p>Vous pourrez parfois voir un <strong>point vert</strong> <img style="vertical-align:middle; width:1.2em; margin:1px" src="../green-dot.png" alt="" /> sur le profil d’un contact.
+Cela veut dire que vous avez <strong>récemment vu</strong> le contact dans les 10 dernières minutes, par exemple parce que vous avez échangé avec ce contact, ou que vous avez reçu un accusé de lecture.</p>

-<p>So this is not a real time online status
-and others will as well not always see that you are “online”.</p>
+<p>Ceci n’est donc pas un indicateur temps réel de présence en ligne et vos contacts ne pourront donc pas toujours voir si vous êtes en ligne ou non.</p>
    
      <h3 id="que-signifient-les-coches-affichées-à-côté-des-messages-sortants-">
        
@@ -367,79 +323,75 @@ and others will as well not always see that you are “online”.</p>

 <ul>
  <li>
-    <p><strong>One tick</strong> <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick1.png" alt="" />
-means that the message was sent successfully to the <a href="#relays">relay</a>.</p>
+    <p><strong>Une marque</strong> <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick1.png" alt="" /> veut dire que le message a été envoyé correctement au <a href="#relays">relai</a>.</p>
  </li>
  <li>
-    <p><strong>Two ticks</strong>  <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick2.png" alt="" />
-indicate your contact has read the message.</p>
+    <p><strong>Deux marques</strong> <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick2.png" alt="" /> indiquent que votre contact a lu le message.</p>
  </li>
 </ul>

-<p>In <a href="#groups">groups</a> the second tick means that at least one member has reported back having read the message.</p>
+<p>Au sein des <a href="#groups">groupes</a> la seconde marque veut dire qu’au moins un membre du groupe a pu lire le message.</p>

-<p>You will only get the second tick if both you and one of the recipients who read the message
-has <strong>Settings → Chats → Read Receipts</strong> enabled.</p>
+<p>La seconde marque ne peut s’afficher que si vous et l’un de vos destinataires du message avez activé <strong>Paramètres → Discussions → Accusés de lecture</strong>.</p>
    
      <h3 id="edit">
        
        
-          Correct typos and delete messages after sending <a href="#edit" class="anchor"></a>
+          Corriger des fautes et supprimer des messages après les avoir envoyés <a href="#edit" class="anchor"></a>
        
        
      </h3>

 <ul>
  <li>
-    <p>You can edit the text of your messages after sending.
-For that, long tap or right click the message and select <strong>Edit</strong>
-or <img style="vertical-align:middle; width:1.2em; margin:1px" src="../edit-icon.png" alt="Edit icon" />.</p>
+    <p>Vous pouvez éditer le texte de votre message après l’avoir envoyé. Pour cela, appuyer longtemps ou faire clic droit sur le message et choisir <strong>Modifier</strong> ou <img style="vertical-align:middle; width:1.2em; margin:1px" src="../edit-icon.png" alt="Edit icon" />.</p>
  </li>
  <li>
-    <p>If you have sent a message accidentally,
-from the same menu, select <strong>Delete</strong> and then <strong>Delete for Everyone</strong>.</p>
+    <p>Si vous avez envoyé un message par erreur vous pouvez le supprimer depuis le même menu en choisissant <strong>Supprimer le message</strong> puis <strong>Supprimer pour moi</strong> ou <strong>Supprimer pour tout le monde</strong>.</p>
  </li>
 </ul>

-<p>While edited messages will have the word “Edited” next to the timestamp,
-deleted messages will be removed without a marker in the chat.
-Notifications are not sent and there is no time limit.</p>
+<p>Les messages modifiés seront indiqués par le mot “Modifié” à côté de l’horodatage du message, tandis que les messages supprimés le sont sans notification, ni dans la discussion, ni sur l’appareil, et peuvent l’être sans limite dans le temps.</p>

-<p>Note, that the original message may still be received by chat members
-who could have already replied, forwarded, saved, screenshotted or otherwise copied the message.</p>
+<p>Remarque : le message original peut toutefois encore exister s’il a déjà été transféré, enregistré, ou si l’un des membres de la discussion en a fait une copie ou une capture d’écran.</p>
    
-      <h3 id="ephemeralmsgs">
+      <h3 id="mediaquality">
        
        
-          How do disappearing messages work? <a href="#ephemeralmsgs" class="anchor"></a>
+          Comment est gérée la qualité des médias envoyés ? <a href="#mediaquality" class="anchor"></a>
        
        
      </h3>

-<p>You can turn on “disappearing messages”
-in the settings of a chat,
-at the top right of the chat window,
-by selecting a time span
-between 5 minutes and 1 year.</p>
+<p>Images, vidéos, fichiers, messages vocaux etc. peuvent être envoyé avec les boutons <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Pièce jointe</strong> ou <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Message vocal</strong>.</p>

-<p>Until the setting is turned off again,
-each chat member’s Delta Chat app takes care
-of deleting the messages
-after the selected time span.
-The time span begins
-when the receiver first sees the message in Delta Chat.
-The messages are deleted both,
-on the servers,
-and in the apps itself.</p>
+<ul>
+  <li>
+    <p>Par défaut le niveau de compression choisi permet un <strong>envoi rapide et efficace</strong> des messages en respectant les limites de données et de stockage de tout le monde. C’est un réglage idéal pour des échanges standards.</p>
+  </li>
+  <li>
+    <p>Dans les régions avec une connectivité limitée il est possible de choisir une compression plus forte dans <strong>Paramètres → Discussions → Qualité du média en sortie</strong>.</p>
+  </li>
+  <li>
+    <p>Si vous souhaitez absolument transmettre un fichier en <strong>qualité originale</strong>, utilisez <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Pièce jointe → Fichier</strong> dans la discussion. Pensez à utiliser cette fonctionnalité avec parcimonie pour limiter l’utilisation des données par toutes les personnes dans la discussion.</p>
+  </li>
+</ul>
+    
+      <h3 id="ephemeralmsgs">
+        
+        
+          Comment fonctionnent les messages éphémères ? <a href="#ephemeralmsgs" class="anchor"></a>
+        
+        
+      </h3>

-<p>Note that you can rely on disappearing messages
-only as long as you trust your chat partners;
-malicious chat partners can take photos,
-or otherwise save, copy or forward messages before deletion.</p>
+<p>Vous pouvez activer les “Messages éphémères” dans les paramètres d’une discussion, dans le menu en haut à droite, en choisissant une durée prédéfinie entre 5 min et 1 an.</p>

-<p>Apart from that,
-if one chat partner uninstalls Delta Chat,
-the (anyway encrypted) messages may take longer to get deleted from their server.</p>
+<p>Tant que le paramètre reste activé, les applications de chacun des membres se chargent de supprimer les messages qui dépassent la durée définie. La durée est comptabilisée à partir du moment où le message est vu pour la première fois, et le message est supprimé au sein de l’application et sur le serveur.</p>
+
+<p>Remarque : ne faites confiance au réglage “Messages éphémères” que si vous faites confiance aux membres de la discussion. Des membres mal intentionné⋅es peuvent très bien prendre des photos, copier, sauvegarder, transférer un message avant qu’il ne soit supprimé.</p>
+
+<p>Enfin, si l’un⋅e des membres d’une discussion désinstalle l’application Delta Chat, les messages (chiffrés, pour rappel) peuvent rester plus longtemps sur le serveur avant d’être supprimés.</p>
    
      <h3 id="delold">
        
@@ -456,39 +408,28 @@ the (anyway encrypted) messages may take longer to get deleted from their server
      <h3 id="remove-account">
        
        
-          How can I delete my chat profile? <a href="#remove-account" class="anchor"></a>
+          Comment puis-je supprimer un profil de discussion ? <a href="#remove-account" class="anchor"></a>
        
        
      </h3>

-<p>If you are using more than one chat profile,
-you can remove single ones in the top profile switcher menu (on Android and iOS),
-or in the sidebar with a right click (in the Desktop app).
-Chat profiles are only removed on the device where deletion was triggered. 
-Chat profiles on other devices will continue to fully function.</p>
+<p>Si vous utilisez plus d’un profil dans l’application, vous pouvez supprimer un profil spécifique via le menu (en haut sur Android et iOS), ou dans la barre latérale (sur l’application de bureau) permettant de passer d’un profil à un autre. Les profils ne sont toujours supprimés que sur l’appareil en question. Les profils continueront donc d’exister sur les autres appareils le cas échéant.</p>

-<p>If you use a single default chat profile you can simply uninstall the app.
-This will still automatically trigger deletion of all associated address data on the chatmail server.
-For more info, please refer to <a href="https://nine.testrun.org/info.html#account-deletion">nine.testrun.org address-deletion</a> 
-or the respective page from your chosen <a href="https://chatmail.at/relays">3rd party chatmail server</a>.</p>
+<p>Si vous n’utilisez qu’un seul profil vous pouvez tout simplement désinstaller l’application. Cela déclenchera la suppression des données liées au profil en question sur le serveur chatmail. Pour plus d’informations voir <a href="https://nine.testrun.org/info.html#account-deletion">Account deletion sur nine.testrun.org</a> ou la page respective du <a href="https://chatmail.at/relays">serveur chatmail</a> que vous utilisez.</p>
    
      <h2 id="groups">
        
        
-          Groups <a href="#groups" class="anchor"></a>
+          Groupes <a href="#groups" class="anchor"></a>
        
        
      </h2>

-<p>Groups let several people chat together privately with <strong>equal rights</strong>.</p>
+<p>Les groupes permettent à plusieurs personnes d’avoir une discussion. Chaque membre du groupe à les <strong>même droits</strong>.</p>

-<p>Anyone can
-change the group name or avatar,
-<a href="#addmembers">add or remove members</a>,
-set <a href="#ephemeralmsgs">disappearing messages</a>,
-and <a href="#edit">delete their own messages</a> from all member’s devices.</p>
+<p>Chaque membre du groupe peut changer le nom du groupe ou l’avatar, <a href="#addmembers">ajouter ou supprimer des membres</a>, activer/désactiver <a href="#ephemeralmsgs">les messages éphémères</a>, et <a href="#edit">supprimer leurs propres messages</a> sur tous les appareils des membres de la discussion.</p>

-<p>Because all members have the same rights, groups work best among <strong>trusted friends and family</strong>.</p>
+<p>Puisque tous les membres d’une discussion ont les mêmes droits, les groupes fonctionnent mieux avec des <strong>personnes de confiance et la famille</strong>.</p>
    
      <h3 id="création-dun-groupe">
        
@@ -513,7 +454,7 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
      <h3 id="addmembers">
        
        
-          Add and remove members <a href="#addmembers" class="anchor"></a>
+          Ajouter et supprimer des membres <a href="#addmembers" class="anchor"></a>
        
        
      </h3>
@@ -1016,22 +957,26 @@ Relays are operated by different groups and people.</p>
 <p>By default, after installation, a relay is <strong>automatically set up</strong>,
 so you do not need to care about that.
 However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+you can configure relays at <strong>Settings → Advanced → Relays</strong>:</p>

 <ul>
  <li>
    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
+<a href="https://chatmail.at/relays">chatmail.at/relays</a> shows some known ones.
+If you have multiple relays, you will receive messages on all of them.
+Contacts learn your current relays automatically when you message them.</p>
  </li>
  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
+    <p>Tap on a relay to set it as <strong>used for sending</strong>.</p>
  </li>
  <li>
    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
+contacts who only know this relay may not reach you until you message them again.
+To stay reachable in the meantime, choose <strong>Hide from Contacts</strong> in the confirmation dialog
+instead of removing it right away.</p>
+  </li>
+  <li>
+    <p>To <strong>show</strong> a hidden relay again, tap on it.</p>
  </li>
 </ul>

@@ -1175,6 +1120,9 @@ to exchange encryption setup information through QR-code scanning or “invite l
    <p><a href="https://autocrypt.org">Autocrypt</a> is used for automatically
 establishing end-to-end encryption between contacts and all members of a group chat.</p>
  </li>
+  <li>
+    <p><a href="https://autocrypt2.org">Autocrypt v2</a>, qui est prévu pour 2026, amènera un chiffrement avec résistance post-quantique ainsi que la confidentialité persistante (“forward secrecy”).</p>
+  </li>
  <li>
    <p><a href="https://github.com/chatmail/core/blob/main/spec.md#attaching-a-contact-to-a-message">Sharing a contact to a
 chat</a>
@@ -1358,12 +1306,10 @@ Instead, all group metadata is end-to-end encrypted and stored on end-user devic
 <p>Servers can therefore only see:</p>

 <ul>
-  <li>the sender and receiver addresses</li>
-  <li>and the message size.</li>
+  <li>Sender and receiver addresses, randomly generated by default</li>
+  <li>Message size</li>
 </ul>

-<p>By default, the addresses are randomly generated.</p>
-
 <p>All other message, contact and group metadata resides in the end-to-end encrypted part of messages.</p>
    
      <h3 id="device-seizure">
@@ -1418,7 +1364,7 @@ For example, tapping a link exposes IP Addresses to unknown parties and is the b
        
      </h3>

-<p>No, not yet.</p>
+<p>Non, pas encore.</p>

 <p>The Signal messenger introduced <a href="https://signal.org/blog/sealed-sender/">“Sealed Sender” in 2018</a>
 to keep their server infrastructure ignorant of who is sending a message to a set of recipients. 
@@ -1439,7 +1385,7 @@ but an implementation has not been agreed as a priority yet.</p>
        
      </h3>

-<p>No, not yet.</p>
+<p>Pas encore mais cela arrive avec <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

 <p>Delta Chat today doesn’t support Perfect Forward Secrecy (PFS).
 This means that if your private decryption key is leaked,
@@ -1450,12 +1396,8 @@ Otherwise, someone obtaining your decryption keys
 is typically also able to get all your non-deleted messages
 and doesn’t even need to decrypt any previously collected messages.</p>

-<p>We designed a Forward Secrecy approach that withstood 
-initial examination from some cryptographers and implementation experts 
-but is pending a more formal write up 
-to ascertain it reliably works in federated messaging and with multi-device usage,
-before it could be implemented in <a href="https://github.com/chatmail/core">chatmail core</a>,
-which would make it available in all <a href="https://chatmail.at/clients">chatmail clients</a>.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, prévu pour 2026, permettra la suppression fiable (forward secrecy) grâce à une rotation automatique des clefs.
+Cette approche est détaillée dans le brouillon du  <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">certificat Autocrypt v2 OpenPGP</a>.</p>
    
      <h3 id="pqc">
        
@@ -1465,12 +1407,11 @@ which would make it available in all <a href="https://chatmail.at/clients">chatm
        
      </h3>

-<p>No, not yet.</p>
+<p>Pas encore mais cela arrive avec <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

-<p>Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
-which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>. 
-We aim to add PQC support in <a href="https://github.com/chatmail/core">chatmail core</a>  after the draft is finalized at the IETF
-in collaboration with other OpenPGP implementers.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, prévu pour 2026, amènera un chiffrement avec résistance post-quantique pour protéger contre les attaques effectuées par des ordinateurs quantiques.
+Delta Chat utilise la librairie Rust OpenPGP <a href="https://github.com/rpgp/rpgp">rPGP</a> qui supporte les dernières <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>.
+L’implémentation est détaillée dans le brouillon du <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">certificat Autocrypt v2 OpenPGP</a>.</p>
    
      <h3 id="how-can-i-manually-check-encryption-information">
        
@@ -5,7 +5,6 @@
      <li><a href="#howtoe2ee">How can I find people to chat with?</a></li>
      <li><a href="#why-is-a-chat-marked-as-request">Why is a chat marked as “Request”?</a></li>
      <li><a href="#how-can-i-put-two-of-my-friends-in-contact-with-each-other">How can I put two of my friends in contact with each other?</a></li>
-      <li><a href="#apakah-delta-chat-mendukung-gambar-vidio-dan-lampiran-lainnya">Apakah Delta Chat mendukung gambar, vidio dan lampiran lainnya?</a></li>
      <li><a href="#multiple-accounts">What are profiles? How can I switch between them?</a></li>
      <li><a href="#siapa-yang-dapat-melihat-foto-profil-saya">Siapa yang dapat melihat Foto Profil saya?</a></li>
      <li><a href="#signature">Can I set a Bio/Status with Delta Chat?</a></li>
@@ -14,6 +13,7 @@
      <li><a href="#what-does-the-green-dot-mean">What does the green dot mean?</a></li>
      <li><a href="#what-do-the-ticks-shown-beside-outgoing-messages-mean">What do the ticks shown beside outgoing messages mean?</a></li>
      <li><a href="#edit">Correct typos and delete messages after sending</a></li>
+      <li><a href="#mediaquality">How is media quality handled?</a></li>
      <li><a href="#ephemeralmsgs">How do disappearing messages work?</a></li>
      <li><a href="#delold">What happens if I turn on “Delete Messages from Device”?</a></li>
      <li><a href="#remove-account">How can I delete my chat profile?</a></li>
@@ -218,19 +218,6 @@ You can also add a little introduction message.</p>
 <p>The second contact will receive a <strong>card</strong> then
 and can tap it to start chatting with the first contact.</p>
    
-      <h3 id="apakah-delta-chat-mendukung-gambar-vidio-dan-lampiran-lainnya">
-        
-        
-          Apakah Delta Chat mendukung gambar, vidio dan lampiran lainnya? <a href="#apakah-delta-chat-mendukung-gambar-vidio-dan-lampiran-lainnya" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
-or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>For performance, images are optimized and sent at a smaller size by default, but you can send it as a “file” to preserve the original.</p>
-    
      <h3 id="multiple-accounts">
        
        
@@ -411,6 +398,32 @@ Notifications are not sent and there is no time limit.</p>
 <p>Note, that the original message may still be received by chat members
 who could have already replied, forwarded, saved, screenshotted or otherwise copied the message.</p>
    
+      <h3 id="mediaquality">
+        
+        
+          How is media quality handled? <a href="#mediaquality" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach-</strong>
+or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons.</p>
+
+<ul>
+  <li>
+    <p>By default, compression ensures <strong>fast, efficient delivery</strong> that respects everyone’s data limits and storage.
+This is ideal for everyday communication.</p>
+  </li>
+  <li>
+    <p>In regions with worse connectivity,
+you can choose higher compression at <strong>Settings → Chats → Outgoing Media Quality</strong>.</p>
+  </li>
+  <li>
+    <p>If you specifically need to send media in its <strong>original quality</strong>, use <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach → File</strong> in the chat.
+Please use this method sparingly, as sending original files will significantly increase data usage for you and all recipients in the chat.</p>
+  </li>
+</ul>
+    
      <h3 id="ephemeralmsgs">
        
        
@@ -1030,22 +1043,26 @@ Relays are operated by different groups and people.</p>
 <p>By default, after installation, a relay is <strong>automatically set up</strong>,
 so you do not need to care about that.
 However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+you can configure relays at <strong>Settings → Advanced → Relays</strong>:</p>

 <ul>
  <li>
    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
+<a href="https://chatmail.at/relays">chatmail.at/relays</a> shows some known ones.
+If you have multiple relays, you will receive messages on all of them.
+Contacts learn your current relays automatically when you message them.</p>
  </li>
  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
+    <p>Tap on a relay to set it as <strong>used for sending</strong>.</p>
  </li>
  <li>
    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
+contacts who only know this relay may not reach you until you message them again.
+To stay reachable in the meantime, choose <strong>Hide from Contacts</strong> in the confirmation dialog
+instead of removing it right away.</p>
+  </li>
+  <li>
+    <p>To <strong>show</strong> a hidden relay again, tap on it.</p>
  </li>
 </ul>

@@ -1188,6 +1205,10 @@ to exchange encryption setup information through QR-code scanning or “invite l
  <li>
    <p><a href="https://autocrypt.org">Autocrypt</a> is used for automatically
 establishing end-to-end encryption between contacts and all members of a group chat.</p>
+  </li>
+  <li>
+    <p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026, 
+will bring post-quantum resistant encryption and forward secrecy.</p>
  </li>
  <li>
    <p><a href="https://github.com/chatmail/core/blob/main/spec.md#attaching-a-contact-to-a-message">Sharing a contact to a
@@ -1372,12 +1393,10 @@ Instead, all group metadata is end-to-end encrypted and stored on end-user devic
 <p>Servers can therefore only see:</p>

 <ul>
-  <li>the sender and receiver addresses</li>
-  <li>and the message size.</li>
+  <li>Sender and receiver addresses, randomly generated by default</li>
+  <li>Message size</li>
 </ul>

-<p>By default, the addresses are randomly generated.</p>
-
 <p>All other message, contact and group metadata resides in the end-to-end encrypted part of messages.</p>
    
      <h3 id="device-seizure">
@@ -1453,7 +1472,7 @@ but an implementation has not been agreed as a priority yet.</p>
        
      </h3>

-<p>No, not yet.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

 <p>Delta Chat today doesn’t support Perfect Forward Secrecy (PFS).
 This means that if your private decryption key is leaked,
@@ -1464,12 +1483,9 @@ Otherwise, someone obtaining your decryption keys
 is typically also able to get all your non-deleted messages
 and doesn’t even need to decrypt any previously collected messages.</p>

-<p>We designed a Forward Secrecy approach that withstood 
-initial examination from some cryptographers and implementation experts 
-but is pending a more formal write up 
-to ascertain it reliably works in federated messaging and with multi-device usage,
-before it could be implemented in <a href="https://github.com/chatmail/core">chatmail core</a>,
-which would make it available in all <a href="https://chatmail.at/clients">chatmail clients</a>.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will provide reliable deletion (forward secrecy) through automatic key rotation.
+This approach is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="pqc">
        
@@ -1479,12 +1495,13 @@ which would make it available in all <a href="https://chatmail.at/clients">chatm
        
      </h3>

-<p>No, not yet.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

-<p>Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
-which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>. 
-We aim to add PQC support in <a href="https://github.com/chatmail/core">chatmail core</a>  after the draft is finalized at the IETF
-in collaboration with other OpenPGP implementers.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will bring post-quantum resistant encryption to protect against quantum computer attacks.
+Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
+which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>.
+The implementation is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="how-can-i-manually-check-encryption-information">
        
@@ -5,7 +5,6 @@
      <li><a href="#howtoe2ee">Come posso trovare persone con cui chattare?</a></li>
      <li><a href="#perché-una-chat-è-contrassegnata-come-richiesta">Perché una chat è contrassegnata come “Richiesta”?</a></li>
      <li><a href="#come-posso-mettere-in-contatto-due-miei-amici">Come posso mettere in contatto due miei amici?</a></li>
-      <li><a href="#delta-chat-supporta-immagini-video-e-altri-allegati">Delta Chat supporta immagini, video e altri allegati?</a></li>
      <li><a href="#multiple-accounts">Cosa sono i profili? Come posso passare dall’uno all’altro?</a></li>
      <li><a href="#chi-vede-la-mia-immagine-del-profilo">Chi vede la mia immagine del profilo?</a></li>
      <li><a href="#signature">Posso impostare una Biografia/Stato con Delta Chat?</a></li>
@@ -14,6 +13,7 @@
      <li><a href="#cosa-significa-il-punto-verde">Cosa significa il punto verde?</a></li>
      <li><a href="#cosa-significano-i-segni-di-spunta-visualizzati-accanto-ai-messaggi-in-uscita">Cosa significano i segni di spunta visualizzati accanto ai messaggi in uscita?</a></li>
      <li><a href="#edit">Correggi gli errori e cancella i messaggi dopo averli inviati</a></li>
+      <li><a href="#mediaquality">Come viene gestita la qualità dei media?</a></li>
      <li><a href="#ephemeralmsgs">Come funzionano i messaggi a scomparsa?</a></li>
      <li><a href="#delold">Cosa succede se attivo “Elimina Messaggi dal Dispositivo”?</a></li>
      <li><a href="#remove-account">Come posso eliminare il mio profilo chat?</a></li>
@@ -217,19 +217,6 @@ Puoi anche aggiungere un breve messaggio di presentazione.</p>
 <p>Il secondo contatto riceverà una <strong>scheda</strong>
 e potrà toccarla per iniziare a chattare con il primo contatto.</p>
    
-      <h3 id="delta-chat-supporta-immagini-video-e-altri-allegati">
-        
-        
-          Delta Chat supporta immagini, video e altri allegati? <a href="#delta-chat-supporta-immagini-video-e-altri-allegati" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>Sì. Immagini, video, files, messaggi vocali ecc. possono essere inviati utilizzando <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Allegato-</strong>
-o <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> pulsanti <strong>Messaggio Vocale</strong></p>
-
-<p>Per le prestazioni, le immagini sono ottimizzate e inviate in dimensioni inferiori per impostazione predefinita, ma è possibile inviarle come “file” per preservare l’originale.</p>
-    
      <h3 id="multiple-accounts">
        
        
@@ -409,6 +396,32 @@ Non vengono inviate notifiche e non c’è limite di tempo.</p>
 <p>Nota che il messaggio originale potrebbe essere ancora sui dispositivi dei membri della chat
 che avrebbero già potuto rispondere, inoltrare, salvare, scattare una schermata o copiare il messaggio in altri modi.</p>
    
+      <h3 id="mediaquality">
+        
+        
+          Come viene gestita la qualità dei media? <a href="#mediaquality" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Immagini, video, files, messaggi vocali ecc. possono essere inviati utilizzando <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Allegato-</strong>
+o <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> pulsanti <strong>Messaggio Vocale</strong></p>
+
+<ul>
+  <li>
+    <p>Per impostazione predefinita, la compressione garantisce una <strong>consegna rapida ed efficiente</strong> che rispetta i limiti di dati e di spazio di archiviazione di tutti.
+Questa soluzione è ideale per la comunicazione quotidiana.</p>
+  </li>
+  <li>
+    <p>Nelle regioni con connettività peggiore,
+è possibile scegliere una compressione più elevata in <strong>Impostazioni → Chat → Qualità Media in Uscita</strong>.</p>
+  </li>
+  <li>
+    <p>Se hai bisogno di inviare i file multimediali nella loro <strong>qualità originale</strong>, usa <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Allega → File</strong> nella chat.
+Si prega di utilizzare questo metodo con parsimonia, poiché l’invio di file originali aumenterà significativamente il consumo di dati per te e per tutti i destinatari della chat.</p>
+  </li>
+</ul>
+    
      <h3 id="ephemeralmsgs">
        
        
@@ -1021,16 +1034,22 @@ Tuttavia, se lo si desidera,

 <ul>
  <li>
-    <p>Puoi <strong>aggiungere</strong> un ripetitore scansionando il suo codice QR;<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> ne mostra alcuni noti.
-Se hai più ripetitori, riceverai messaggi su tutti.</p>
+    <p>Puoi <strong>aggiungere</strong> un ripetitore scansionando il suo codice QR;
+<a href="https://chatmail.at/relays">chatmail.at/relays</a> mostra alcuni ripetitori noti.
+Se hai più ripetitori, riceverai i messaggi su tutti.
+I contatti vengono a conoscenza automaticamente dei tuoi ripetitori attuali quando invii loro un messaggio.</p>
  </li>
  <li>
-    <p>L’opzione <strong>predefinita</strong> definisce quella a cui i tuoi partner di chat invieranno messaggi futuri.</p>
+    <p>Tocca un ripetitore per impostarlo come <strong>utilizzato per l’invio</strong>.</p>
  </li>
  <li>
    <p>Se <strong>rimuovi</strong> un ripetitore,
-assicurati che un altro ripetitore predefinito sia stato utilizzato per un periodo di tempo sufficiente.
-In caso contrario, i messaggi dei tuoi interlocutori di chat non ti   arriveranno.In caso di dubbio, rimuovilo in seguito.</p>
+i contatti che conoscono solo quel ripetitore potrebbero non raggiungerti finché non invierai loro un nuovo messaggio.
+Per rimanere raggiungibile nel frattempo, seleziona <strong>Nascondi dai Contatti</strong> nella finestra di dialogo di conferma
+invece di rimuoverlo immediatamente.</p>
+  </li>
+  <li>
+    <p>Per <strong>visualizzare</strong> nuovamente un ripetitore nascosto, toccalo.</p>
  </li>
 </ul>

@@ -1173,6 +1192,10 @@ per scambiare informazioni sulla configurazione della crittografia tramite la sc
  <li>
    <p><a href="https://autocrypt.org">Autocrypt</a> viene utilizzato per stabilire
 automaticamente la crittografia end-to-end tra i contatti e tutti i membri di una chat di gruppo.</p>
+  </li>
+  <li>
+    <p><a href="https://autocrypt2.org">Autocrypt v2</a>, la cui piena implementazione è prevista per il 2026,
+introdurrà una crittografia post-quantistica resistente e una segretezza avanzata.</p>
  </li>
  <li>
    <p><a href="https://github.com/chatmail/core/blob/main/spec.md#attaching-a-contact-to-a-message">Condivisione di un contatto con una
@@ -1436,7 +1459,7 @@ ma un’implementazione non è stata ancora concordata come priorità.</p>
        
      </h3>

-<p>No, non ancora.</p>
+<p>Non ancora, ma arriverà con <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

 <p>Delta Chat al momento non supporta la tecnologia Perfect Forward Secrecy (PFS).
 Ciò significa che se la tua chiave di decrittazione privata viene divulgata
@@ -1447,12 +1470,9 @@ In caso contrario, chi ottiene le tue chiavi di decrittazione
 in genere è in grado di ottenere anche tutti i tuoi messaggi non eliminati
 e non ha nemmeno bisogno di decifrare i messaggi raccolti in precedenza.</p>

-<p>Abbiamo progettato un approccio Forward Secrecy che ha superato
-l’esame iniziale di alcuni crittografi ed esperti di implementazione
-ma è in attesa di una stesura più formale
-per accertarne l’affidabilità nella messaggistica federata e nell’utilizzo su più dispositivi,
-prima di poter essere implementato in <a href="https://github.com/chatmail/core">chatmail core</a>,
-che lo renderebbe disponibile in tutti i <a href="https://chatmail.at/clients">clients di chatmail</a>.</p>
+<p><a href="https://autocrypt2.org">autocrypt v2</a>, la cui piena implementazione è prevista per il 2026,
+garantirà un’eliminazione affidabile (segretezza in avanti) tramite rotazione automatica delle chiavi.
+Questo approccio è specificato nella bozza dei <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">certificati OpenPGP di Autocrypt v2</a>.</p>
    
      <h3 id="pqc">
        
@@ -1462,12 +1482,13 @@ che lo renderebbe disponibile in tutti i <a href="https://chatmail.at/clients">c
        
      </h3>

-<p>No, non ancora.</p>
+<p>Non ancora, ma arriverà con <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

-<p>Delta Chat utilizza la libreria Rust OpenPGP <a href="https://github.com/rpgp/rpgp">rPGP</a>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, la cui piena implementazione è prevista per il 2026,
+offrirà una crittografia post-quantistica resistente per proteggere dagli attacchi ai computer quantistici.
+Delta Chat utilizza la libreria Rust OpenPGP <a href="https://github.com/rpgp/rpgp">rPGP</a>
 che supporta l’ultima <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">bozza IETF Post-Quantum-Cryptography OpenPGP</a>.
-Il nostro obiettivo è aggiungere il supporto PQC nel <a href="https://github.com/chatmail/core">core di chatmail</a> dopo che la bozza sarà stata finalizzata dall’IETF
-in collaborazione con altri implementatori di OpenPGP.</p>
+L’implementazione è specificata nella bozza dei <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Certificati OpenPGP Autocrypt v2</a>.</p>
    
      <h3 id="come-posso-controllare-manualmente-le-informazioni-di-crittografia">
        
@@ -1647,31 +1668,31 @@ ordinate cronologicamente:</p>

 <ul>
  <li>
-    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
-program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
-along with collaboration partners working on
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>,
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>,
-<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and
-<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>.
-All of these projects are partially completed or to be completed in early 2025.</p>
+    <p>Nel 2023 e nel 2024 siamo stati accettati nel programma Next Generation Internet (NGI)
+per il nostro lavoro in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
+insieme ai partner di collaborazione che lavorano su 
+<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>, 
+<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>, 
+<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> e 
+<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>. 
+Tutti questi progetti sono parzialmente completati o saranno completati all’inizio del 2025.</p>
  </li>
  <li>
    <p>Nel 2021 abbiamo ricevuto ulteriori finanziamenti dall’UE per due proposte di Next-Generation-Internet, ovvero per <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - directory di portabilità dei provider di posta elettronica</a> (~97.000 EUR) e <a href="https://nlnet.nl/project/EmailPorting/">AEAP - portabilità degli indirizzi email</a> (~90.000 EUR), che hanno portato a un migliore supporto multi-profilo, a un miglioramento delle impostazioni di contatto e di gruppo tramite codice QR e a numerosi miglioramenti di rete su tutte le piattaforme.</p>
  </li>
  <li>
-    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
-completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
+    <p>La <a href="https://nlnet.nl/">fondazione NLnet</a> ha concesso nel 2019/2020 46.000 EUR per
+completando i collegamenti Rust/Python e avviando un ecosistema Chat-bot.</p>
  </li>
  <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p>L’<a href="https://opentechfund.org">Open Technology Fund</a> ci ha dato una
+prima sovvenzione 2018/2019 (~$200K) durante la quale abbiamo notevolmente migliorato l’app Android
+e ha rilasciato una prima versione beta dell’app desktop, e che inoltre
+ancorato i nostri sviluppi delle funzionalità nella ricerca sulla UX nei contesti dei diritti umani,
+vedete il nostro <a href="https://delta.chat/en/2019-07-19-uxreport">Rapporto Needfinding e UX</a> conclusivo.
+La seconda sovvenzione 2019/2020 (~$300K) ci ha aiutato a farlo
+rilasciare nelle versioni Delta/iOS, per convertire la nostra libreria principale in Rust, e
+per fornire nuove funzionalità per tutte le piattaforme.</p>
  </li>
  <li>
    <p>Il progetto UE <a href="https://nextleap.eu">NEXTLEAP</a> ha finanziato la ricerca
@@ -5,7 +5,6 @@
      <li><a href="#howtoe2ee">How can I find people to chat with?</a></li>
      <li><a href="#why-is-a-chat-marked-as-request">Why is a chat marked as “Request”?</a></li>
      <li><a href="#how-can-i-put-two-of-my-friends-in-contact-with-each-other">How can I put two of my friends in contact with each other?</a></li>
-      <li><a href="#ondersteunt-delta-chat-afbeeldingen-videos-en-ander-soort-bijlagen">Ondersteunt Delta Chat afbeeldingen, video’s en ander soort bijlagen?</a></li>
      <li><a href="#multiple-accounts">What are profiles? How can I switch between them?</a></li>
      <li><a href="#wie-kan-mijn-profielfoto-zien">Wie kan mijn profielfoto zien?</a></li>
      <li><a href="#signature">Can I set a Bio/Status with Delta Chat?</a></li>
@@ -14,6 +13,7 @@
      <li><a href="#wat-betekent-die-groene-stip">Wat betekent die groene stip?</a></li>
      <li><a href="#wat-betekenen-de-vinkjes-naast-verzonden-berichten">Wat betekenen de vinkjes naast verzonden berichten?</a></li>
      <li><a href="#edit">Correct typos and delete messages after sending</a></li>
+      <li><a href="#mediaquality">How is media quality handled?</a></li>
      <li><a href="#ephemeralmsgs">How do disappearing messages work?</a></li>
      <li><a href="#delold">Wat gebeurt er als ik ‘Oude berichten van server verwijderen’ inschakel?</a></li>
      <li><a href="#remove-account">How can I delete my chat profile?</a></li>
@@ -218,19 +218,6 @@ You can also add a little introduction message.</p>
 <p>The second contact will receive a <strong>card</strong> then
 and can tap it to start chatting with the first contact.</p>
    
-      <h3 id="ondersteunt-delta-chat-afbeeldingen-videos-en-ander-soort-bijlagen">
-        
-        
-          Ondersteunt Delta Chat afbeeldingen, video’s en ander soort bijlagen? <a href="#ondersteunt-delta-chat-afbeeldingen-videos-en-ander-soort-bijlagen" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
-or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>Om de prestaties te verhogen, worden afbeeldingen standaard geoptimaliseerd en verkleind verstuurd, maar je kunt ze als een bestand verzenden om het origineel te sturen.</p>
-    
      <h3 id="multiple-accounts">
        
        
@@ -410,6 +397,32 @@ Notifications are not sent and there is no time limit.</p>
 <p>Note, that the original message may still be received by chat members
 who could have already replied, forwarded, saved, screenshotted or otherwise copied the message.</p>
    
+      <h3 id="mediaquality">
+        
+        
+          How is media quality handled? <a href="#mediaquality" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach-</strong>
+or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons.</p>
+
+<ul>
+  <li>
+    <p>By default, compression ensures <strong>fast, efficient delivery</strong> that respects everyone’s data limits and storage.
+This is ideal for everyday communication.</p>
+  </li>
+  <li>
+    <p>In regions with worse connectivity,
+you can choose higher compression at <strong>Settings → Chats → Outgoing Media Quality</strong>.</p>
+  </li>
+  <li>
+    <p>If you specifically need to send media in its <strong>original quality</strong>, use <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach → File</strong> in the chat.
+Please use this method sparingly, as sending original files will significantly increase data usage for you and all recipients in the chat.</p>
+  </li>
+</ul>
+    
      <h3 id="ephemeralmsgs">
        
        
@@ -1024,22 +1037,26 @@ Relays are operated by different groups and people.</p>
 <p>By default, after installation, a relay is <strong>automatically set up</strong>,
 so you do not need to care about that.
 However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+you can configure relays at <strong>Settings → Advanced → Relays</strong>:</p>

 <ul>
  <li>
    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
+<a href="https://chatmail.at/relays">chatmail.at/relays</a> shows some known ones.
+If you have multiple relays, you will receive messages on all of them.
+Contacts learn your current relays automatically when you message them.</p>
  </li>
  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
+    <p>Tap on a relay to set it as <strong>used for sending</strong>.</p>
  </li>
  <li>
    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
+contacts who only know this relay may not reach you until you message them again.
+To stay reachable in the meantime, choose <strong>Hide from Contacts</strong> in the confirmation dialog
+instead of removing it right away.</p>
+  </li>
+  <li>
+    <p>To <strong>show</strong> a hidden relay again, tap on it.</p>
  </li>
 </ul>

@@ -1182,6 +1199,10 @@ to exchange encryption setup information through QR-code scanning or “invite l
  <li>
    <p><a href="https://autocrypt.org">Autocrypt</a> is used for automatically
 establishing end-to-end encryption between contacts and all members of a group chat.</p>
+  </li>
+  <li>
+    <p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026, 
+will bring post-quantum resistant encryption and forward secrecy.</p>
  </li>
  <li>
    <p><a href="https://github.com/chatmail/core/blob/main/spec.md#attaching-a-contact-to-a-message">Sharing a contact to a
@@ -1366,12 +1387,10 @@ Instead, all group metadata is end-to-end encrypted and stored on end-user devic
 <p>Servers can therefore only see:</p>

 <ul>
-  <li>the sender and receiver addresses</li>
-  <li>and the message size.</li>
+  <li>Sender and receiver addresses, randomly generated by default</li>
+  <li>Message size</li>
 </ul>

-<p>By default, the addresses are randomly generated.</p>
-
 <p>All other message, contact and group metadata resides in the end-to-end encrypted part of messages.</p>
    
      <h3 id="device-seizure">
@@ -1447,7 +1466,7 @@ but an implementation has not been agreed as a priority yet.</p>
        
      </h3>

-<p>No, not yet.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

 <p>Delta Chat today doesn’t support Perfect Forward Secrecy (PFS).
 This means that if your private decryption key is leaked,
@@ -1458,12 +1477,9 @@ Otherwise, someone obtaining your decryption keys
 is typically also able to get all your non-deleted messages
 and doesn’t even need to decrypt any previously collected messages.</p>

-<p>We designed a Forward Secrecy approach that withstood 
-initial examination from some cryptographers and implementation experts 
-but is pending a more formal write up 
-to ascertain it reliably works in federated messaging and with multi-device usage,
-before it could be implemented in <a href="https://github.com/chatmail/core">chatmail core</a>,
-which would make it available in all <a href="https://chatmail.at/clients">chatmail clients</a>.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will provide reliable deletion (forward secrecy) through automatic key rotation.
+This approach is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="pqc">
        
@@ -1473,12 +1489,13 @@ which would make it available in all <a href="https://chatmail.at/clients">chatm
        
      </h3>

-<p>No, not yet.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

-<p>Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
-which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>. 
-We aim to add PQC support in <a href="https://github.com/chatmail/core">chatmail core</a>  after the draft is finalized at the IETF
-in collaboration with other OpenPGP implementers.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will bring post-quantum resistant encryption to protect against quantum computer attacks.
+Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
+which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>.
+The implementation is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="how-can-i-manually-check-encryption-information">
        
@@ -5,7 +5,6 @@
      <li><a href="#howtoe2ee">How can I find people to chat with?</a></li>
      <li><a href="#why-is-a-chat-marked-as-request">Why is a chat marked as “Request”?</a></li>
      <li><a href="#how-can-i-put-two-of-my-friends-in-contact-with-each-other">How can I put two of my friends in contact with each other?</a></li>
-      <li><a href="#czy-delta-chat-obsługuje-obrazy-filmy-i-inne-załączniki">Czy Delta Chat obsługuje obrazy, filmy i inne załączniki?</a></li>
      <li><a href="#multiple-accounts">Czym są profile? Jak mogę przełączać się między nimi?</a></li>
      <li><a href="#kto-widzi-moje-zdjęcie-profilowe">Kto widzi moje zdjęcie profilowe?</a></li>
      <li><a href="#signature">Can I set a Bio/Status with Delta Chat?</a></li>
@@ -14,6 +13,7 @@
      <li><a href="#co-oznacza-zielona-kropka">Co oznacza zielona kropka?</a></li>
      <li><a href="#co-oznaczają-znaczniki-wyświetlane-obok-wiadomości-wychodzących">Co oznaczają znaczniki wyświetlane obok wiadomości wychodzących?</a></li>
      <li><a href="#edit">Poprawianie literówek i usuwanie wiadomości po wysłaniu</a></li>
+      <li><a href="#mediaquality">How is media quality handled?</a></li>
      <li><a href="#ephemeralmsgs">Jak działają znikające wiadomości?</a></li>
      <li><a href="#delold">Co się stanie, jeśli włączę opcję „Usuń wiadomości z urządzenia”?</a></li>
      <li><a href="#remove-account">How can I delete my chat profile?</a></li>
@@ -215,19 +215,6 @@ You can also add a little introduction message.</p>
 <p>The second contact will receive a <strong>card</strong> then
 and can tap it to start chatting with the first contact.</p>
    
-      <h3 id="czy-delta-chat-obsługuje-obrazy-filmy-i-inne-załączniki">
-        
-        
-          Czy Delta Chat obsługuje obrazy, filmy i inne załączniki? <a href="#czy-delta-chat-obsługuje-obrazy-filmy-i-inne-załączniki" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>Tak. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
-or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>Ze względu na wydajność obrazy są domyślnie optymalizowane i wysyłane w mniejszym rozmiarze, ale można je wysłać jako „plik”, aby zachować oryginał.</p>
-    
      <h3 id="multiple-accounts">
        
        
@@ -392,6 +379,32 @@ has <strong>Settings → Chats → Read Receipts</strong> enabled.</p>

 <p>Pamiętaj, że oryginalną wiadomość nadal mogą otrzymać członkowie czatu, którzy mogli już odpowiedzieć, przesłać dalej, zapisać, wykonać zrzut ekranu lub w inny sposób skopiować wiadomość.</p>
    
+      <h3 id="mediaquality">
+        
+        
+          How is media quality handled? <a href="#mediaquality" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach-</strong>
+or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons.</p>
+
+<ul>
+  <li>
+    <p>By default, compression ensures <strong>fast, efficient delivery</strong> that respects everyone’s data limits and storage.
+This is ideal for everyday communication.</p>
+  </li>
+  <li>
+    <p>In regions with worse connectivity,
+you can choose higher compression at <strong>Settings → Chats → Outgoing Media Quality</strong>.</p>
+  </li>
+  <li>
+    <p>If you specifically need to send media in its <strong>original quality</strong>, use <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach → File</strong> in the chat.
+Please use this method sparingly, as sending original files will significantly increase data usage for you and all recipients in the chat.</p>
+  </li>
+</ul>
+    
      <h3 id="ephemeralmsgs">
        
        
@@ -946,22 +959,26 @@ Relays are operated by different groups and people.</p>
 <p>By default, after installation, a relay is <strong>automatically set up</strong>,
 so you do not need to care about that.
 However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+you can configure relays at <strong>Settings → Advanced → Relays</strong>:</p>

 <ul>
  <li>
    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
+<a href="https://chatmail.at/relays">chatmail.at/relays</a> shows some known ones.
+If you have multiple relays, you will receive messages on all of them.
+Contacts learn your current relays automatically when you message them.</p>
  </li>
  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
+    <p>Tap on a relay to set it as <strong>used for sending</strong>.</p>
  </li>
  <li>
    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
+contacts who only know this relay may not reach you until you message them again.
+To stay reachable in the meantime, choose <strong>Hide from Contacts</strong> in the confirmation dialog
+instead of removing it right away.</p>
+  </li>
+  <li>
+    <p>To <strong>show</strong> a hidden relay again, tap on it.</p>
  </li>
 </ul>

@@ -1102,6 +1119,10 @@ weekly statistics will be automatically sent to a bot.</p>
  <li>
    <p><a href="https://autocrypt.org">Autocrypt</a> służy do automatycznego ustanawiania szyfrowania typu end-to-end między kontaktami a wszystkimi członkami czatu grupowego.</p>
  </li>
+  <li>
+    <p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026, 
+will bring post-quantum resistant encryption and forward secrecy.</p>
+  </li>
  <li>
    <p><a href="https://github.com/chatmail/core/blob/main/spec.md#attaching-a-contact-to-a-message">Udostępnienie kontaktu na czacie</a> umożliwia odbiorcom korzystanie z szyfrowania typu end-to-end z tym kontaktem.</p>
  </li>
@@ -1236,12 +1257,10 @@ even if the message was not end-to-end encrypted.</p>
 <p>Servers can therefore only see:</p>

 <ul>
-  <li>the sender and receiver addresses</li>
-  <li>and the message size.</li>
+  <li>Sender and receiver addresses, randomly generated by default</li>
+  <li>Message size</li>
 </ul>

-<p>By default, the addresses are randomly generated.</p>
-
 <p>Wszystkie pozostałe metadane dotyczące wiadomości, kontaktów i grup znajdują się w zaszyfrowanej metodą end-to-end części wiadomości.</p>
    
      <h3 id="device-seizure">
@@ -1314,11 +1333,13 @@ but an implementation has not been agreed as a priority yet.</p>
        
      </h3>

-<p>Nie, jeszcze nie.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

 <p>Delta Chat obecnie nie obsługuje mechanizmu Perfect Forward Secrecy (PFS). Oznacza to, że jeśli twój prywatny klucz deszyfrujący zostanie ujawniony, a ktoś zdobędzie twoje wcześniejsze wiadomości w trakcie transmisji, będzie mógł je odszyfrować i odczytać za pomocą ujawnionego klucza deszyfrującego. Należy pamiętać, że mechanizm Forward Secrecy zwiększa bezpieczeństwo tylko w przypadku usuwania wiadomości. W przeciwnym razie osoba, która uzyska twoje klucze deszyfrujące, zazwyczaj będzie mogła uzyskać dostęp do wszystkich nieusuniętych wiadomości i nie będzie musiała odszyfrowywać żadnych wcześniej zebranych wiadomości.</p>

-<p>Opracowaliśmy metodę Forward Secrecy, która przeszła wstępną analizę niektórych kryptografów i ekspertów ds. wdrożeń, ale oczekuje na bardziej formalne opracowanie, które potwierdzi jej niezawodne działanie w federacyjnym przesyłaniu wiadomości i w przypadku korzystania z wielu urządzeń, zanim zostanie zaimplementowana w <a href="https://github.com/chatmail/core">rdzeniu chatmail</a>, co uczyniłoby ją dostępną we wszystkich <a href="https://chatmail.at/clients">klientach chatmail</a>.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will provide reliable deletion (forward secrecy) through automatic key rotation.
+This approach is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="pqc">
        
@@ -1328,9 +1349,13 @@ but an implementation has not been agreed as a priority yet.</p>
        
      </h3>

-<p>Nie, jeszcze nie.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

-<p>Delta Chat korzysta z biblioteki Rust OpenPGP <a href="https://github.com/rpgp/rpgp">rPGP</a>, która obsługuje najnowszy <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">projekt OpenPGP IETF Post-Quantum-Cryptography</a>. Planujemy dodać obsługę PQC do <a href="https://github.com/chatmail/core">rdzenia chatmail</a> po sfinalizowaniu projektu w IETF we współpracy z innymi implementatorami OpenPGP.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will bring post-quantum resistant encryption to protect against quantum computer attacks.
+Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
+which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>.
+The implementation is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="jak-mogę-ręcznie-sprawdzić-informacje-o-szyfrowaniu">
        
@@ -1463,32 +1488,17 @@ Raczej korzystamy z publicznych źródeł finansowania, jak dotąd pochodzących

 <ul>
  <li>
-    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
-program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
-along with collaboration partners working on
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>,
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>,
-<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and
-<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>.
-All of these projects are partially completed or to be completed in early 2025.</p>
+    <p>W latach 2023 i 2024 zostaliśmy przyjęci do programu Next Generation Internet (NGI) za naszą pracę w <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>, wraz z partnerami współpracującymi pracującymi nad <a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>, <a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>, <a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> i <a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>. Wszystkie te projekty są częściowo ukończone lub zostaną ukończone na początku 2025 r.</p>
  </li>
  <li>
-    <p>In 2021 we received further EU funding for two Next-Generation-Internet
-proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+    <p>W 2021 r. otrzymaliśmy kolejne dofinansowanie z UE na dwie propozycje dotyczące Internetu nowej generacji, a mianowicie na <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD – katalog przenośności dostawcy poczty e-mail</a> ( ~97 tys. EUR) i <a href="https://nlnet.nl/project/EmailPorting/">AEAP – przenoszenie adresu e-mail</a> (~90 tys. EUR), co zaowocowało lepszą obsługą wielu kont, ulepszonymi kontaktami i ustawieniami grup za pomocą kodów QR oraz wieloma ulepszeniami sieciowymi na wszystkich platformach.</p>
  </li>
  <li>
-    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
-completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
+    <p><a href="https://nlnet.nl/">Fundacja NLnet</a> przekazała w latach 2019/2020 kwotę 46 tys. EUR na wykonanie wiązań Rust/Python i uruchomienie ekosystemu Chat-bot.</p>
  </li>
  <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p><a href="https://opentechfund.org">Open Technology Fund</a> przyznał nam pierwszy grant w 2018/2019 (~200 000 $), dzięki któremu znacznie ulepszyliśmy aplikację na Androida i wydaliśmy pierwszą wersję beta aplikacji na komputery stacjonarne, a także ugruntował rozwój naszych funkcji w badaniach UX w kontekście praw człowieka, zobacz nasz końcowy raport <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX</a>.
+Druga dotacja w 2019/2020 (~300 000 4) pomogła nam wydać wersje Delta/iOS, przekonwertować naszą podstawową bibliotekę na Rust i zapewnić nowe funkcje dla wszystkich platform.</p>
  </li>
  <li>
    <p>Unijny projekt <a href="https://nextleap.eu">NEXTLEAP</a> sfinansował badania i wdrożenie zweryfikowanych grup i ustawień protokołów kontaktowych w latach 2017 i 2018, a także pomógł zintegrować szyfrowanie end-to-end poprzez <a href="https://autocrypt.org">Autocrypt</a>.</p>
@@ -5,7 +5,6 @@
      <li><a href="#howtoe2ee">Como posso encontrar pessoas para conversar?</a></li>
      <li><a href="#por-que-um-chat-está-marcado-como-solicitação">Por que um chat está marcado como “Solicitação”?</a></li>
      <li><a href="#como-posso-colocar-dois-dos-meus-amigos-em-contato-um-com-o-outro">Como posso colocar dois dos meus amigos em contato um com o outro?</a></li>
-      <li><a href="#dá-para-mandar-imagens-vídeos-e-outros-anexos-pelo-delta-chat">Dá para mandar imagens, vídeos e outros anexos pelo Delta Chat?</a></li>
      <li><a href="#multiple-accounts">O que são perfis? Como posso alternar entre eles?</a></li>
      <li><a href="#quem-consegue-ver-a-imagem-do-meu-perfil">Quem consegue ver a imagem do meu perfil?</a></li>
      <li><a href="#signature">Posso definir uma Bio/Assinatura com o Delta Chat?</a></li>
@@ -14,6 +13,7 @@
      <li><a href="#o-que-significa-o-ponto-verde">O que significa o ponto verde?</a></li>
      <li><a href="#o-que-significam-os-carrapatos-mostrados-ao-lado-das-mensagens-de-saída">O que significam os carrapatos mostrados ao lado das mensagens de saída?</a></li>
      <li><a href="#edit">Corrigir erros de digitação e excluir mensagens após o envio</a></li>
+      <li><a href="#mediaquality">How is media quality handled?</a></li>
      <li><a href="#ephemeralmsgs">Como funcionam as mensagens efêmeras?</a></li>
      <li><a href="#delold">O que acontece se eu ativar a opção “Apagar mensagens do dispositivo”?</a></li>
      <li><a href="#remove-account">Como posso excluir minha conta?</a></li>
@@ -218,19 +218,6 @@ Você também pode adicionar uma pequena mensagem de apresentação.</p>
 <p>O segundo contato receberá um <strong>cartão</strong>
 e poderá tocar nele para começar a conversar com o primeiro contato.</p>
    
-      <h3 id="dá-para-mandar-imagens-vídeos-e-outros-anexos-pelo-delta-chat">
-        
-        
-          Dá para mandar imagens, vídeos e outros anexos pelo Delta Chat? <a href="#dá-para-mandar-imagens-vídeos-e-outros-anexos-pelo-delta-chat" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>Sim. Imagens, vídeos, arquivos, mensagens de voz etc. podem ser enviados usando os botões de<img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Anexo-</strong>
-ou <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Mensagem de Voz</strong></p>
-
-<p>Para fins de desempenho, as imagens são otimizadas e enviadas em um tamanho menor por padrão, mas você pode enviá-las como um “arquivo” para preservar o original.</p>
-    
      <h3 id="multiple-accounts">
        
        
@@ -409,6 +396,32 @@ Não são enviadas notificações e não há limite de tempo.</p>
 <p>Observe que a mensagem original ainda pode ser recebida pelos membros do conversa 
 que podem ter respondido, encaminhado, salvo, capturado a tela ou copiado a mensagem.</p>
    
+      <h3 id="mediaquality">
+        
+        
+          How is media quality handled? <a href="#mediaquality" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Imagens, vídeos, arquivos, mensagens de voz etc. podem ser enviados usando os botões de<img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Anexo-</strong>
+ou <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Mensagem de Voz</strong></p>
+
+<ul>
+  <li>
+    <p>By default, compression ensures <strong>fast, efficient delivery</strong> that respects everyone’s data limits and storage.
+This is ideal for everyday communication.</p>
+  </li>
+  <li>
+    <p>In regions with worse connectivity,
+you can choose higher compression at <strong>Settings → Chats → Outgoing Media Quality</strong>.</p>
+  </li>
+  <li>
+    <p>If you specifically need to send media in its <strong>original quality</strong>, use <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach → File</strong> in the chat.
+Please use this method sparingly, as sending original files will significantly increase data usage for you and all recipients in the chat.</p>
+  </li>
+</ul>
+    
      <h3 id="ephemeralmsgs">
        
        
@@ -1025,22 +1038,26 @@ Relays are operated by different groups and people.</p>
 <p>By default, after installation, a relay is <strong>automatically set up</strong>,
 so you do not need to care about that.
 However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+you can configure relays at <strong>Settings → Advanced → Relays</strong>:</p>

 <ul>
  <li>
    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
+<a href="https://chatmail.at/relays">chatmail.at/relays</a> shows some known ones.
+If you have multiple relays, you will receive messages on all of them.
+Contacts learn your current relays automatically when you message them.</p>
  </li>
  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
+    <p>Tap on a relay to set it as <strong>used for sending</strong>.</p>
  </li>
  <li>
    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
+contacts who only know this relay may not reach you until you message them again.
+To stay reachable in the meantime, choose <strong>Hide from Contacts</strong> in the confirmation dialog
+instead of removing it right away.</p>
+  </li>
+  <li>
+    <p>To <strong>show</strong> a hidden relay again, tap on it.</p>
  </li>
 </ul>

@@ -1183,6 +1200,10 @@ to exchange encryption setup information through QR-code scanning or “invite l
  <li>
    <p><a href="https://autocrypt.org">Autocrypt</a> is used for automatically
 establishing end-to-end encryption between contacts and all members of a group chat.</p>
+  </li>
+  <li>
+    <p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026, 
+will bring post-quantum resistant encryption and forward secrecy.</p>
  </li>
  <li>
    <p><a href="https://github.com/chatmail/core/blob/main/spec.md#attaching-a-contact-to-a-message">Sharing a contact to a
@@ -1367,12 +1388,10 @@ Instead, all group metadata is end-to-end encrypted and stored on end-user devic
 <p>Servers can therefore only see:</p>

 <ul>
-  <li>the sender and receiver addresses</li>
-  <li>and the message size.</li>
+  <li>Sender and receiver addresses, randomly generated by default</li>
+  <li>Message size</li>
 </ul>

-<p>By default, the addresses are randomly generated.</p>
-
 <p>All other message, contact and group metadata resides in the end-to-end encrypted part of messages.</p>
    
      <h3 id="device-seizure">
@@ -1448,7 +1467,7 @@ but an implementation has not been agreed as a priority yet.</p>
        
      </h3>

-<p>No, not yet.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

 <p>Delta Chat today doesn’t support Perfect Forward Secrecy (PFS).
 This means that if your private decryption key is leaked,
@@ -1459,12 +1478,9 @@ Otherwise, someone obtaining your decryption keys
 is typically also able to get all your non-deleted messages
 and doesn’t even need to decrypt any previously collected messages.</p>

-<p>We designed a Forward Secrecy approach that withstood 
-initial examination from some cryptographers and implementation experts 
-but is pending a more formal write up 
-to ascertain it reliably works in federated messaging and with multi-device usage,
-before it could be implemented in <a href="https://github.com/chatmail/core">chatmail core</a>,
-which would make it available in all <a href="https://chatmail.at/clients">chatmail clients</a>.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will provide reliable deletion (forward secrecy) through automatic key rotation.
+This approach is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="pqc">
        
@@ -1474,12 +1490,13 @@ which would make it available in all <a href="https://chatmail.at/clients">chatm
        
      </h3>

-<p>No, not yet.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

-<p>Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
-which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>. 
-We aim to add PQC support in <a href="https://github.com/chatmail/core">chatmail core</a>  after the draft is finalized at the IETF
-in collaboration with other OpenPGP implementers.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will bring post-quantum resistant encryption to protect against quantum computer attacks.
+Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
+which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>.
+The implementation is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="how-can-i-manually-check-encryption-information">
        
@@ -5,7 +5,6 @@
      <li><a href="#howtoe2ee">Как найти людей для общения?</a></li>
      <li><a href="#почему-чат-помечен-как-запрос">Почему чат помечен как “Запрос”?</a></li>
      <li><a href="#как-я-могу-связать-двух-своих-друзей-друг-с-другом">Как я могу связать двух своих друзей друг с другом?</a></li>
-      <li><a href="#поддерживает-ли-delta-chat-изображения-видео-и-другие-вложения">Поддерживает ли Delta Chat изображения, видео и другие вложения?</a></li>
      <li><a href="#multiple-accounts">Что такое профили? Как я могу переключатся между ними?</a></li>
      <li><a href="#кто-видит-изображение-моего-профиля">Кто видит изображение моего профиля?</a></li>
      <li><a href="#signature">Могу ли я установить статус/подпись в Delta Chat?</a></li>
@@ -14,6 +13,7 @@
      <li><a href="#что-означает-зеленая-точка">Что означает зеленая точка?</a></li>
      <li><a href="#что-означают-галочки-рядом-с-исходящими-сообщениями">Что означают галочки рядом с исходящими сообщениями?</a></li>
      <li><a href="#edit">Исправление опечаток и удаление сообщений после отправки</a></li>
+      <li><a href="#mediaquality">Как обеспечивается качество мультимедиа?</a></li>
      <li><a href="#ephemeralmsgs">Как работают исчезающие сообщения?</a></li>
      <li><a href="#delold">Что произойдет, если я включу функцию “Удалять сообщения с устройства”?</a></li>
      <li><a href="#remove-account">Как удалить свой профиль в чате?</a></li>
@@ -214,19 +214,6 @@
 <p>Второй контакт получит <strong>карточку</strong>
 на которую можно нажать, чтобы начать общение с первым контактом.</p>
    
-      <h3 id="поддерживает-ли-delta-chat-изображения-видео-и-другие-вложения">
-        
-        
-          Поддерживает ли Delta Chat изображения, видео и другие вложения? <a href="#поддерживает-ли-delta-chat-изображения-видео-и-другие-вложения" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>Да. Изображения, видео, файлы, голосовые сообщения и т.д. можно отправлять с помощью кнопок <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Вложение</strong>
-или <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Голосовое сообщение</strong>.</p>
-
-<p>Для повышения производительности, изображения оптимизируются и отправляются по умолчанию в уменьшенном размере, но вы можете отправить их как “файл”, чтобы сохранить оригинал.</p>
-    
      <h3 id="multiple-accounts">
        
        
@@ -406,6 +393,32 @@
 <p>Обратите внимание, что исходное сообщение все еще может быть получено участниками чата
 которые могли уже ответить, переслать, сохранить, сделать скриншот или иным образом скопировать сообщение.</p>
    
+      <h3 id="mediaquality">
+        
+        
+          Как обеспечивается качество мультимедиа? <a href="#mediaquality" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Изображения, видео, файлы, голосовые сообщения и т.д. можно отправлять с помощью кнопок <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Вложение</strong>
+или <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Голосовое сообщение</strong>.</p>
+
+<ul>
+  <li>
+    <p>По умолчанию сжатие обеспечивает <strong>быструю и эффективную доставку</strong> сообщений, учитывая ограничения по объему данных и хранилищу у всех пользователей.
+Это идеально подходит для повседневного общения.</p>
+  </li>
+  <li>
+    <p>В регионах с плохим качеством связи,
+вы можете выбрать более высокую степень сжатия в меню <strong>Настройки → Чаты → Качество отправляемых медиафайлов</strong>.</p>
+  </li>
+  <li>
+    <p>Если вам необходимо отправить мультимедийный файл в <strong>исходном качестве</strong>, используйте значок <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Прикрепить → Файл</strong> в чате.
+Используйте этот метод с осторожностью, так как отправка файлов в исходном качестве значительно увеличит объем трафика как для вас, так и для всех участников чата.</p>
+  </li>
+</ul>
+    
      <h3 id="ephemeralmsgs">
        
        
@@ -1024,22 +1037,26 @@ PIN-код разблокировки экрана, графический кл
 <p>По умолчанию, после установки, релей <strong>настраивается автоматически</strong>,
 поэтому вам не нужно об этом волноваться.
 Однако, если хотите,
-вы можете настроить релеи в <strong>Настройки → Дополнительно → Релеи</strong>:</p>
+вы можете настроить релеи в меню <strong>Настройки → Дополнительно → Релеи</strong>:</p>

 <ul>
  <li>
    <p>Вы можете <strong>добавить</strong> релей, отсканировав его QR-код;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> содержит список известных релеев.
-Если у вас несколько релеев, вы будете получать сообщения на все из них.</p>
+на сайте <a href="https://chatmail.at/relays">chatmail.at/relays</a> представлен список известных.
+Если у вас настроено несколько релеев, сообщения будут доставляться через все из них.
+Ваши контакты автоматически узнают о текущих используемых вами релеях при обмене сообщениями.</p>
  </li>
  <li>
-    <p><strong>По умолчанию</strong> определяет релей, на который ваши собеседники будут отправлять будущие сообщения.</p>
+    <p>Нажмите на релей, чтобы установить его как <strong>используемый для отправки</strong>.</p>
  </li>
  <li>
-    <p>Если вы <strong>удаляете</strong> релей,
-убедитесь, что другой релей по умолчанию использовался в течение достаточного количества времени.
-В противном случае сообщения от ваших собеседников не будут доходить до вас.
-Если сомневаетесь, удалите его позже.</p>
+    <p>Если вы <strong>удалите</strong> релей,
+контакты, которые знают только этот релей, не смогут связаться с вами до тех пор, пока вы снова не напишите им.
+Чтобы оставаться на связи в это время, выберите опцию <strong>Скрыть из контактов</strong> во всплывающем окне
+вместо того, чтобы удалять его сразу.</p>
+  </li>
+  <li>
+    <p>Чтобы снова <strong>показать</strong> скрытый релей, нажмите на него.</p>
  </li>
 </ul>

@@ -1181,6 +1198,10 @@ Chatmail использует INBOX по умолчанию для ретран
  <li>
    <p><a href="https://autocrypt.org">Autocrypt</a> используется для автоматической
 настройки сквозного шифрования между контактами и всеми членами группового чата.</p>
+  </li>
+  <li>
+    <p><a href="https://autocrypt2.org">Autocrypt v2</a>, полное внедрение которого запланировано на 2026 год, 
+обеспечит поддержку постквантового шифрования и прямой секретности.</p>
  </li>
  <li>
    <p><a href="https://github.com/chatmail/core/blob/main/spec.md#attaching-a-contact-to-a-message">Обмен контактом в
@@ -1365,12 +1386,10 @@ Delta Chat вместо этого использует реализацию Ope
 <p>Таким образом, серверы могут видеть только:</p>

 <ul>
-  <li>адрес отправителя и получателя</li>
-  <li>а также размер сообщения.</li>
+  <li>Адреса отправителя и получателя, по умолчанию генерируются случайным образом</li>
+  <li>Размер сообщения</li>
 </ul>

-<p>По умолчанию адреса генерируются случайным образом.</p>
-
 <p>Все прочие метаданные сообщений, контактов и групп содержатся в части сообщений, защищённой сквозным шифрованием.</p>
    
      <h3 id="device-seizure">
@@ -1427,7 +1446,7 @@ Delta Chat вместо этого использует реализацию Ope
        
      </h3>

-<p>Нет, еще нет.</p>
+<p>Нет, пока нет.</p>

 <p>Мессенджер Signal внедрил функцию <a href="https://signal.org/blog/sealed-sender/">“Sealed Sender” (Засекреченный отправитель) в 2018 году</a>,
 чтобы их серверная инфраструктура не имела информации о том, кто отправляет сообщение группе получателей. 
@@ -1448,7 +1467,7 @@ Delta Chat вместо этого использует реализацию Ope
        
      </h3>

-<p>Нет, еще нет.</p>
+<p>Пока нет, но это будет реализовано в <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

 <p>На данный момент, Delta Chat не поддерживает Perfect Forward Secrecy (PFS) (Совершенную прямую секретность).
 Это означает, что если ваш приватный ключ дешифрования будет скомпрометирован,
@@ -1459,12 +1478,9 @@ Delta Chat вместо этого использует реализацию Ope
 также может получить все ваши не удалённые сообщения
 и ему даже не нужно расшифровывать какие-либо ранее собранные сообщения.</p>

-<p>Мы разработали подход к Forward Secrecy (Прямой секретности), который прошёл 
-первичную проверку некоторыми криптографами и экспертами по реализации 
-но требует более формального описания 
-чтобы убедиться, что он надёжно работает в федеративном обмене сообщениями и при использовании нескольких устройств,
-прежде чем он может быть внедрён в <a href="https://github.com/chatmail/core">ядро chatmail</a>,
-что сделает его доступным во всех <a href="https://chatmail.at/clients">клиентах clients</a>.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, полное внедрение которого запланировано на 2026 год,
+обеспечит надёжное удаление (прямую секретность) за счёт автоматической ротации ключей.
+Этот подход описан в черновике спецификации <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a>.</p>
    
      <h3 id="pqc">
        
@@ -1474,12 +1490,13 @@ Delta Chat вместо этого использует реализацию Ope
        
      </h3>

-<p>Нет, еще нет.</p>
+<p>Пока нет, но эта возможность появится в <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

-<p>Delta Chat использует библиотеку OpenPGP на Rust <a href="https://github.com/rpgp/rpgp">rPGP</a>,
-которая поддерживает последний <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">черновик IETF Post-Quantum-Cryptography OpenPGP</a>. 
-Мы планируем добавить поддержку PQC в <a href="https://github.com/chatmail/core">ядро chatmail</a>  после того, как черновик будет окончательно утвержден в IETF
-в сотрудничестве с другими разработчиками OpenPGP.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, полное внедрение которого запланировано на 2026 год,
+обеспечит поддержку постквантового шифрования для защиты от атак с использованием квантовых компьютеров.
+Delta Chat использует Rust-библиотеку OpenPGP <a href="https://github.com/rpgp/rpgp">rPGP</a>
+которая поддерживает актуальный черновик IETF <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP</a>.
+Особенности реализации описаны в черновике спецификации <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a>.</p>
    
      <h3 id="как-можно-вручную-проверить-информацию-о-шифровании">
        
@@ -1658,32 +1675,32 @@ Google Play Store, F-Droid, Huawei App Gallery, iOS и macOS App Store, Microsof

 <ul>
  <li>
-    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
-program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
-along with collaboration partners working on
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>,
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>,
-<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and
-<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>.
-All of these projects are partially completed or to be completed in early 2025.</p>
+    <p>В 2023 и 2024 годах мы были приняты в программу Next Generation Internet (NGI)
+за нашу работу над <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
+в сотрудничестве с партнерами, работающими над 
+<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>, 
+<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>, 
+<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> и 
+<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>. 
+Все эти проекты частично завершены или будут завершены в начале 2025 года.</p>
  </li>
  <li>
    <p>В 2021 г. мы получили дополнительное финансирование из ЕС для двух Next-Generation-Internet
 целей, а именно для <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - e-mail provider portability directory</a> (~97 тыс. евро) и <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90 тыс. евро). Это привело к улучшению поддержки нескольких профилей, улучшению настройки контактов и групп с помощью QR-кода и многим улучшениям в сетевом взаимодействии на всех платформах.</p>
  </li>
  <li>
-    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
-completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
+    <p>Фонд <a href="https://nlnet.nl/">NLnet Foundation</a> выделил в 2019/2020 году 46 тысяч евро на
+доработку связки Rust/Python и создание экосистемы чат-ботов..</p>
  </li>
  <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p>Фонд <a href="https://opentechfund.org">Open Technology Fund</a> предоставил нам 
+первый грант в 2018/2019 году (~$200 тыс.), благодаря которому мы существенно улучшили приложение для Android 
+и выпустили первую бета-версию приложения для настольных систем, а также провели 
+исследования в области UX в контексте прав человека, 
+ см. наш заключительный отчет <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
+Второй грант, полученный в 2019/2020 году (~$300 тыс.), помог нам 
+выпустить версии Delta/iOS, перевести наш основной код на Rust и 
+предоставить новые функции для всех платформ.</p>
  </li>
  <li>
    <p>Проект ЕС <a href="https://nextleap.eu">NEXTLEAP</a> финансировал исследование
@@ -5,7 +5,6 @@
      <li><a href="#howtoe2ee">How can I find people to chat with?</a></li>
      <li><a href="#why-is-a-chat-marked-as-request">Why is a chat marked as “Request”?</a></li>
      <li><a href="#how-can-i-put-two-of-my-friends-in-contact-with-each-other">How can I put two of my friends in contact with each other?</a></li>
-      <li><a href="#podporuje-delta-chat-obrázky-videá-a-iné-prílohy">Podporuje Delta Chat obrázky, videá a iné prílohy?</a></li>
      <li><a href="#multiple-accounts">What are profiles? How can I switch between them?</a></li>
      <li><a href="#kto-vidí-moju-profilovú-fotku">Kto vidí moju profilovú fotku?</a></li>
      <li><a href="#signature">Can I set a Bio/Status with Delta Chat?</a></li>
@@ -14,6 +13,7 @@
      <li><a href="#what-does-the-green-dot-mean">What does the green dot mean?</a></li>
      <li><a href="#čo-znamenajú-zaškrtnutia-zobrazené-vedľa-odchádzajúcich-správ">Čo znamenajú zaškrtnutia zobrazené vedľa odchádzajúcich správ?</a></li>
      <li><a href="#edit">Correct typos and delete messages after sending</a></li>
+      <li><a href="#mediaquality">How is media quality handled?</a></li>
      <li><a href="#ephemeralmsgs">How do disappearing messages work?</a></li>
      <li><a href="#delold">What happens if I turn on “Delete Messages from Device”?</a></li>
      <li><a href="#remove-account">How can I delete my chat profile?</a></li>
@@ -218,19 +218,6 @@ You can also add a little introduction message.</p>
 <p>The second contact will receive a <strong>card</strong> then
 and can tap it to start chatting with the first contact.</p>
    
-      <h3 id="podporuje-delta-chat-obrázky-videá-a-iné-prílohy">
-        
-        
-          Podporuje Delta Chat obrázky, videá a iné prílohy? <a href="#podporuje-delta-chat-obrázky-videá-a-iné-prílohy" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
-or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>For performance, images are optimized and sent at a smaller size by default, but you can send it as a “file” to preserve the original.</p>
-    
      <h3 id="multiple-accounts">
        
        
@@ -411,6 +398,32 @@ Notifications are not sent and there is no time limit.</p>
 <p>Note, that the original message may still be received by chat members
 who could have already replied, forwarded, saved, screenshotted or otherwise copied the message.</p>
    
+      <h3 id="mediaquality">
+        
+        
+          How is media quality handled? <a href="#mediaquality" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach-</strong>
+or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons.</p>
+
+<ul>
+  <li>
+    <p>By default, compression ensures <strong>fast, efficient delivery</strong> that respects everyone’s data limits and storage.
+This is ideal for everyday communication.</p>
+  </li>
+  <li>
+    <p>In regions with worse connectivity,
+you can choose higher compression at <strong>Settings → Chats → Outgoing Media Quality</strong>.</p>
+  </li>
+  <li>
+    <p>If you specifically need to send media in its <strong>original quality</strong>, use <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach → File</strong> in the chat.
+Please use this method sparingly, as sending original files will significantly increase data usage for you and all recipients in the chat.</p>
+  </li>
+</ul>
+    
      <h3 id="ephemeralmsgs">
        
        
@@ -1030,22 +1043,26 @@ Relays are operated by different groups and people.</p>
 <p>By default, after installation, a relay is <strong>automatically set up</strong>,
 so you do not need to care about that.
 However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+you can configure relays at <strong>Settings → Advanced → Relays</strong>:</p>

 <ul>
  <li>
    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
+<a href="https://chatmail.at/relays">chatmail.at/relays</a> shows some known ones.
+If you have multiple relays, you will receive messages on all of them.
+Contacts learn your current relays automatically when you message them.</p>
  </li>
  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
+    <p>Tap on a relay to set it as <strong>used for sending</strong>.</p>
  </li>
  <li>
    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
+contacts who only know this relay may not reach you until you message them again.
+To stay reachable in the meantime, choose <strong>Hide from Contacts</strong> in the confirmation dialog
+instead of removing it right away.</p>
+  </li>
+  <li>
+    <p>To <strong>show</strong> a hidden relay again, tap on it.</p>
  </li>
 </ul>

@@ -1188,6 +1205,10 @@ to exchange encryption setup information through QR-code scanning or “invite l
  <li>
    <p><a href="https://autocrypt.org">Autocrypt</a> is used for automatically
 establishing end-to-end encryption between contacts and all members of a group chat.</p>
+  </li>
+  <li>
+    <p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026, 
+will bring post-quantum resistant encryption and forward secrecy.</p>
  </li>
  <li>
    <p><a href="https://github.com/chatmail/core/blob/main/spec.md#attaching-a-contact-to-a-message">Sharing a contact to a
@@ -1372,12 +1393,10 @@ Instead, all group metadata is end-to-end encrypted and stored on end-user devic
 <p>Servers can therefore only see:</p>

 <ul>
-  <li>the sender and receiver addresses</li>
-  <li>and the message size.</li>
+  <li>Sender and receiver addresses, randomly generated by default</li>
+  <li>Message size</li>
 </ul>

-<p>By default, the addresses are randomly generated.</p>
-
 <p>All other message, contact and group metadata resides in the end-to-end encrypted part of messages.</p>
    
      <h3 id="device-seizure">
@@ -1453,7 +1472,7 @@ but an implementation has not been agreed as a priority yet.</p>
        
      </h3>

-<p>No, not yet.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

 <p>Delta Chat today doesn’t support Perfect Forward Secrecy (PFS).
 This means that if your private decryption key is leaked,
@@ -1464,12 +1483,9 @@ Otherwise, someone obtaining your decryption keys
 is typically also able to get all your non-deleted messages
 and doesn’t even need to decrypt any previously collected messages.</p>

-<p>We designed a Forward Secrecy approach that withstood 
-initial examination from some cryptographers and implementation experts 
-but is pending a more formal write up 
-to ascertain it reliably works in federated messaging and with multi-device usage,
-before it could be implemented in <a href="https://github.com/chatmail/core">chatmail core</a>,
-which would make it available in all <a href="https://chatmail.at/clients">chatmail clients</a>.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will provide reliable deletion (forward secrecy) through automatic key rotation.
+This approach is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="pqc">
        
@@ -1479,12 +1495,13 @@ which would make it available in all <a href="https://chatmail.at/clients">chatm
        
      </h3>

-<p>No, not yet.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

-<p>Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
-which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>. 
-We aim to add PQC support in <a href="https://github.com/chatmail/core">chatmail core</a>  after the draft is finalized at the IETF
-in collaboration with other OpenPGP implementers.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will bring post-quantum resistant encryption to protect against quantum computer attacks.
+Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
+which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>.
+The implementation is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="how-can-i-manually-check-encryption-information">
        
@@ -5,7 +5,6 @@
      <li><a href="#howtoe2ee">How can I find people to chat with?</a></li>
      <li><a href="#why-is-a-chat-marked-as-request">Why is a chat marked as “Request”?</a></li>
      <li><a href="#how-can-i-put-two-of-my-friends-in-contact-with-each-other">How can I put two of my friends in contact with each other?</a></li>
-      <li><a href="#a-mbulon-delta-chat-i-figura-video-dhe-bashkëngjitje-të-tjera">A mbulon Delta Chat-i figura, video dhe bashkëngjitje të tjera?</a></li>
      <li><a href="#multiple-accounts">What are profiles? How can I switch between them?</a></li>
      <li><a href="#kush-e-sheh-profilin-tim">Kush e sheh profilin tim?</a></li>
      <li><a href="#signature">Can I set a Bio/Status with Delta Chat?</a></li>
@@ -14,6 +13,7 @@
      <li><a href="#çdo-të-thotë-pika-e-gjelbër">Ç’do të thotë pika e gjelbër?</a></li>
      <li><a href="#çduan-të-thonë-shenjat-e-shfaqura-pas-mesazheve-që-dërgohen">Ç’duan të thonë shenjat e shfaqura pas mesazheve që dërgohen?</a></li>
      <li><a href="#edit">Correct typos and delete messages after sending</a></li>
+      <li><a href="#mediaquality">How is media quality handled?</a></li>
      <li><a href="#ephemeralmsgs">How do disappearing messages work?</a></li>
      <li><a href="#delold">Ç’ndodh, nëse aktivizoj “Fshi prej pajisjes mesazhe të vjetër”?</a></li>
      <li><a href="#remove-account">How can I delete my chat profile?</a></li>
@@ -218,19 +218,6 @@ You can also add a little introduction message.</p>
 <p>The second contact will receive a <strong>card</strong> then
 and can tap it to start chatting with the first contact.</p>
    
-      <h3 id="a-mbulon-delta-chat-i-figura-video-dhe-bashkëngjitje-të-tjera">
-        
-        
-          A mbulon Delta Chat-i figura, video dhe bashkëngjitje të tjera? <a href="#a-mbulon-delta-chat-i-figura-video-dhe-bashkëngjitje-të-tjera" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>Po Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
-or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>Si parazgjedhje, për funksionim më të mirë, figurat optimizohen dhe dërgohen në madhësi më të vogël, por mund ta dërgoni si një “kartelë”, që të ruhet origjinali.</p>
-    
      <h3 id="multiple-accounts">
        
        
@@ -410,6 +397,32 @@ Notifications are not sent and there is no time limit.</p>
 <p>Note, that the original message may still be received by chat members
 who could have already replied, forwarded, saved, screenshotted or otherwise copied the message.</p>
    
+      <h3 id="mediaquality">
+        
+        
+          How is media quality handled? <a href="#mediaquality" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach-</strong>
+or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons.</p>
+
+<ul>
+  <li>
+    <p>By default, compression ensures <strong>fast, efficient delivery</strong> that respects everyone’s data limits and storage.
+This is ideal for everyday communication.</p>
+  </li>
+  <li>
+    <p>In regions with worse connectivity,
+you can choose higher compression at <strong>Settings → Chats → Outgoing Media Quality</strong>.</p>
+  </li>
+  <li>
+    <p>If you specifically need to send media in its <strong>original quality</strong>, use <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach → File</strong> in the chat.
+Please use this method sparingly, as sending original files will significantly increase data usage for you and all recipients in the chat.</p>
+  </li>
+</ul>
+    
      <h3 id="ephemeralmsgs">
        
        
@@ -1032,22 +1045,26 @@ Relays are operated by different groups and people.</p>
 <p>By default, after installation, a relay is <strong>automatically set up</strong>,
 so you do not need to care about that.
 However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+you can configure relays at <strong>Settings → Advanced → Relays</strong>:</p>

 <ul>
  <li>
    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
+<a href="https://chatmail.at/relays">chatmail.at/relays</a> shows some known ones.
+If you have multiple relays, you will receive messages on all of them.
+Contacts learn your current relays automatically when you message them.</p>
  </li>
  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
+    <p>Tap on a relay to set it as <strong>used for sending</strong>.</p>
  </li>
  <li>
    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
+contacts who only know this relay may not reach you until you message them again.
+To stay reachable in the meantime, choose <strong>Hide from Contacts</strong> in the confirmation dialog
+instead of removing it right away.</p>
+  </li>
+  <li>
+    <p>To <strong>show</strong> a hidden relay again, tap on it.</p>
  </li>
 </ul>

@@ -1190,6 +1207,10 @@ to exchange encryption setup information through QR-code scanning or “invite l
  <li>
    <p><a href="https://autocrypt.org">Autocrypt</a> is used for automatically
 establishing end-to-end encryption between contacts and all members of a group chat.</p>
+  </li>
+  <li>
+    <p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026, 
+will bring post-quantum resistant encryption and forward secrecy.</p>
  </li>
  <li>
    <p><a href="https://github.com/chatmail/core/blob/main/spec.md#attaching-a-contact-to-a-message">Sharing a contact to a
@@ -1374,12 +1395,10 @@ Instead, all group metadata is end-to-end encrypted and stored on end-user devic
 <p>Servers can therefore only see:</p>

 <ul>
-  <li>the sender and receiver addresses</li>
-  <li>and the message size.</li>
+  <li>Sender and receiver addresses, randomly generated by default</li>
+  <li>Message size</li>
 </ul>

-<p>By default, the addresses are randomly generated.</p>
-
 <p>All other message, contact and group metadata resides in the end-to-end encrypted part of messages.</p>
    
      <h3 id="device-seizure">
@@ -1455,7 +1474,7 @@ but an implementation has not been agreed as a priority yet.</p>
        
      </h3>

-<p>No, not yet.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

 <p>Delta Chat today doesn’t support Perfect Forward Secrecy (PFS).
 This means that if your private decryption key is leaked,
@@ -1466,12 +1485,9 @@ Otherwise, someone obtaining your decryption keys
 is typically also able to get all your non-deleted messages
 and doesn’t even need to decrypt any previously collected messages.</p>

-<p>We designed a Forward Secrecy approach that withstood 
-initial examination from some cryptographers and implementation experts 
-but is pending a more formal write up 
-to ascertain it reliably works in federated messaging and with multi-device usage,
-before it could be implemented in <a href="https://github.com/chatmail/core">chatmail core</a>,
-which would make it available in all <a href="https://chatmail.at/clients">chatmail clients</a>.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will provide reliable deletion (forward secrecy) through automatic key rotation.
+This approach is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="pqc">
        
@@ -1481,12 +1497,13 @@ which would make it available in all <a href="https://chatmail.at/clients">chatm
        
      </h3>

-<p>No, not yet.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

-<p>Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
-which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>. 
-We aim to add PQC support in <a href="https://github.com/chatmail/core">chatmail core</a>  after the draft is finalized at the IETF
-in collaboration with other OpenPGP implementers.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will bring post-quantum resistant encryption to protect against quantum computer attacks.
+Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
+which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>.
+The implementation is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="how-can-i-manually-check-encryption-information">
        
@@ -1675,28 +1692,31 @@ along with collaboration partners working on
 All of these projects are partially completed or to be completed in early 2025.</p>
  </li>
  <li>
-    <p>In 2021 we received further EU funding for two Next-Generation-Internet
-proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+    <p>Më 2021-n morëm financime të mëtejshme nga BE për dy propozime që shtrihen në
+“Internetin e Brezit Tjetër”, konkretisht për <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - e-mail provider portability directory</a> (~97K euro) dhe <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K euro) që sollën mbulim më të mirë për përdorues me shumë
+llogari, përmirësim të gjërave për kontakte me kod QR dhe grupe, si dhe mjaft
+përmirësime në punën në rrjet për krejt platformat.</p>
  </li>
  <li>
-    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
-completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
+    <p><a href="https://nlnet.nl/">Fondacioni NLnet</a> dhuroi 46K euro gjatë 2019/2020 për
+plotësimin e <em>Rust/Python bindings</em> dhe për t’i dhënë udhë një ekosistemi
+Chat-bot.</p>
  </li>
  <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p><a href="https://opentechfund.org">Open Technology Fund</a> na dha grantin e parë 
+për 2018/2019 (~200 mijë dollarë) me të cilin përmirësuam ndjeshëm aplikacionin
+për Android dhe hodhëm në qarkullim një version të parë beta aplikacioni për Desktop,
+si dhe i afroi më tepër zhvillimet tona për veçori me kërkime UX në kontekste të drejtash të njeriut, 
+shihni <a href="https://delta.chat/en/2019-07-19-uxreport">raportin tonë përfundimtar “Needfinding and UX”</a>.
+Granti i dytë për 2019/2020 (~$300K) na ndihmoi të hedhim në qarkullim 
+versione Delta/iOS, për të shndërruar bibliotekën tonë bazë në Rust, si dhe
+për të sjellë veçori të reja për krejt platformat.</p>
  </li>
  <li>
-    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
-and implementation of verified groups and setup contact protocols
-in 2017 and 2018 and also helped to integrate end-to-end Encryption
-through <a href="https://autocrypt.org">Autocrypt</a>.</p>
+    <p>Projekti <a href="https://nextleap.eu">NEXTLEAP</a> i BE-së financoi kërkimin
+për dhe sendërtimin e grupeve të verifikuara dhe protokolleve të
+ujdisjes së kontakteve më 2017-n dhe 2018-n dhe ndihmoi gjithashtu
+të integrohet Fshehtëzim Skaj-më-Skaj përmes <a href="https://autocrypt.org">Autocrypt</a>.</p>
  </li>
  <li>
    <p>Ndonjëherë marrim dhurime unike nga individë privatë. 
@@ -5,7 +5,6 @@
      <li><a href="#howtoe2ee">Як мені знайти людей для спілкування?</a></li>
      <li><a href="#why-is-a-chat-marked-as-request">Why is a chat marked as “Request”?</a></li>
      <li><a href="#how-can-i-put-two-of-my-friends-in-contact-with-each-other">How can I put two of my friends in contact with each other?</a></li>
-      <li><a href="#чи-підтримує-delta-chat-вкладення-у-вигляді-фото-відео-тощо">Чи підтримує Delta Chat вкладення у вигляді фото, відео тощо?</a></li>
      <li><a href="#multiple-accounts">Що таке профілі? Як я можу перемикатися між ними?</a></li>
      <li><a href="#хто-бачить-моє-зображення-профілю">Хто бачить моє зображення профілю?</a></li>
      <li><a href="#signature">Чи можу я встановити біографію/статус у Delta Chat?</a></li>
@@ -14,6 +13,7 @@
      <li><a href="#що-означає-зелена-точка">Що означає зелена точка?</a></li>
      <li><a href="#що-означають-галочки-біля-вихідних-повідомлень">Що означають галочки біля вихідних повідомлень?</a></li>
      <li><a href="#edit">Виправлення помилок та видалення повідомлень після надсилання</a></li>
+      <li><a href="#mediaquality">How is media quality handled?</a></li>
      <li><a href="#ephemeralmsgs">Як працюють повідомлення, що зникають?</a></li>
      <li><a href="#delold">Що станеться, якщо я ввімкну «Видаляти старі повідомлення з пристрою»?</a></li>
    </ul>
@@ -140,17 +140,10 @@

 <ul>
  <li>
-    <p>If you are <strong>face to face</strong> with your friend or family,
-tap the <strong>QR Code</strong> icon <img style="vertical-align:middle; height:1.3em; margin:1px" src="../qr-icon.png" />
-on the main screen.<br />
-Ask your chat partner to <strong>scan</strong> the QR image
-with their Delta Chat app.</p>
+    <p>Якщо ви перебуваєте <strong>віч-на-віч</strong> зі своїм другом або родиною, торкніться піктограми <strong>QR-код</strong> на головному екрані <img style="vertical-align:middle; height:1.3em; margin:1px" src="../qr-icon.png" /> на головному екрані. Попросіть вашого партнера по чату <strong>сканувати</strong> QR-зображення за допомогою їхнього застосунку Delta Chat.</p>
  </li>
  <li>
-    <p>For a <strong>remote</strong> contact setup,
-from the same screen,
-click “Copy” or “Share” and send the <strong>invite link</strong>
-through another private chat.</p>
+    <p>Для <strong>віддаленого</strong> налаштування контакту, на тому ж самому екрані, натисніть “Копіювати” або “Поділитися” і відправте <strong>запрошувальне посилання</strong> через інший приватний чат.</p>
  </li>
 </ul>

@@ -211,19 +204,6 @@ You can also add a little introduction message.</p>
 <p>The second contact will receive a <strong>card</strong> then
 and can tap it to start chatting with the first contact.</p>
    
-      <h3 id="чи-підтримує-delta-chat-вкладення-у-вигляді-фото-відео-тощо">
-        
-        
-          Чи підтримує Delta Chat вкладення у вигляді фото, відео тощо? <a href="#чи-підтримує-delta-chat-вкладення-у-вигляді-фото-відео-тощо" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>Так. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
-or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>З міркувань продуктивності, зображення оптимізовані та надсилаються в меншому розмірі за замовчуванням, але ви можете надіслати їх як «файл», щоб зберегти оригінал.</p>
-    
      <h3 id="multiple-accounts">
        
        
@@ -388,6 +368,32 @@ has <strong>Settings → Chats → Read Receipts</strong> enabled.</p>

 <p>Зауважте, що початкове повідомлення все ще може бути отримане учасниками чату які могли вже відповісти, переслати, зберегти, зробити знімок екрану або іншим чином скопіювати повідомлення.</p>
    
+      <h3 id="mediaquality">
+        
+        
+          How is media quality handled? <a href="#mediaquality" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach-</strong>
+or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons.</p>
+
+<ul>
+  <li>
+    <p>By default, compression ensures <strong>fast, efficient delivery</strong> that respects everyone’s data limits and storage.
+This is ideal for everyday communication.</p>
+  </li>
+  <li>
+    <p>In regions with worse connectivity,
+you can choose higher compression at <strong>Settings → Chats → Outgoing Media Quality</strong>.</p>
+  </li>
+  <li>
+    <p>If you specifically need to send media in its <strong>original quality</strong>, use <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attach → File</strong> in the chat.
+Please use this method sparingly, as sending original files will significantly increase data usage for you and all recipients in the chat.</p>
+  </li>
+</ul>
+    
      <h3 id="ephemeralmsgs">
        
        
@@ -939,22 +945,26 @@ Relays are operated by different groups and people.</p>
 <p>By default, after installation, a relay is <strong>automatically set up</strong>,
 so you do not need to care about that.
 However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+you can configure relays at <strong>Settings → Advanced → Relays</strong>:</p>

 <ul>
  <li>
    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
+<a href="https://chatmail.at/relays">chatmail.at/relays</a> shows some known ones.
+If you have multiple relays, you will receive messages on all of them.
+Contacts learn your current relays automatically when you message them.</p>
  </li>
  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
+    <p>Tap on a relay to set it as <strong>used for sending</strong>.</p>
  </li>
  <li>
    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
+contacts who only know this relay may not reach you until you message them again.
+To stay reachable in the meantime, choose <strong>Hide from Contacts</strong> in the confirmation dialog
+instead of removing it right away.</p>
+  </li>
+  <li>
+    <p>To <strong>show</strong> a hidden relay again, tap on it.</p>
  </li>
 </ul>

@@ -1095,6 +1105,10 @@ to send anonymous usage statistics.</p>
  <li>
    <p><a href="https://autocrypt.org">Autocrypt</a> використовується для автоматичного встановлення наскрізного шифрування між контактами і всіма учасниками групового чату.</p>
  </li>
+  <li>
+    <p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026, 
+will bring post-quantum resistant encryption and forward secrecy.</p>
+  </li>
  <li>
    <p><a href="https://github.com/chatmail/core/blob/main/spec.md#attaching-a-contact-to-a-message">Поширення контакту в чаті</a> дозволяє отримувачам використовувати наскрізне шифрування з контактом.</p>
  </li>
@@ -1298,11 +1312,13 @@ but an implementation has not been agreed as a priority yet.</p>
        
      </h3>

-<p>Ні, поки ще ні.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

 <p>Delta Chat наразі не підтримує ідеальну пряму секретність (Perfect Forward Secrecy, PFS). Це означає, що якщо ваш приватний ключ для розшифрування буде скомпрометовано, а хтось заздалегідь зібрав ваші повідомлення під час передачі, він зможе розшифрувати та прочитати їх, використовуючи зламаний ключ. Зверніть увагу, що пряма секретність підвищує рівень безпеки лише в тому разі, якщо ви видаляєте повідомлення. Інакше, якщо хтось отримує доступ до ваших ключів розшифрування, він зазвичай також має доступ до всіх ваших невидалених повідомлень і навіть не потребує розшифровувати заздалегідь перехоплені дані.</p>

-<p>Ми розробили підхід Forward Secrecy, який витримав початкову експертизу від деяких криптографів та експертів з реалізації але чекає на більш офіційний звіт щоб переконатися, що він надійно працює в об’єднаних системах обміну повідомленнями та при використанні декількох пристроїв, перш ніж його можна буде реалізувати в <a href="https://github.com/chatmail/core">ядрі чату</a>, що зробить його доступним у всіх <a href="https://chatmail.at/clients">клієнтах чату</a>.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will provide reliable deletion (forward secrecy) through automatic key rotation.
+This approach is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="pqc">
        
@@ -1312,9 +1328,13 @@ but an implementation has not been agreed as a priority yet.</p>
        
      </h3>

-<p>Ні, поки ще ні.</p>
+<p>Not yet, but it’s coming with <a href="https://autocrypt2.org">Autocrypt v2</a>.</p>

-<p>Delta Chat використовує бібліотеку Rust OpenPGP <a href="https://github.com/rpgp/rpgp">rPGP</a> яка підтримує останню версію <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>. Ми плануємо додати підтримку PQC у <a href="https://github.com/chatmail/core">chatmail core</a> після того, як проект буде завершено у IETF у співпраці з іншими розробниками OpenPGP.</p>
+<p><a href="https://autocrypt2.org">Autocrypt v2</a>, scheduled for full implementation in 2026,
+will bring post-quantum resistant encryption to protect against quantum computer attacks.
+Delta Chat uses the Rust OpenPGP library <a href="https://github.com/rpgp/rpgp">rPGP</a>
+which supports the latest <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/">IETF Post-Quantum-Cryptography OpenPGP draft</a>.
+The implementation is specified in the <a href="https://datatracker.ietf.org/doc/draft-autocrypt-openpgp-v2-cert/">Autocrypt v2 OpenPGP Certificates</a> draft.</p>
    
      <h3 id="як-я-можу-вручну-перевірити-інформацію-про-шифрування">
        
@@ -1445,32 +1465,24 @@ Google Play Store, F-Droid, Huawei App Gallery, iOS and macOS App Store, Microso

 <ul>
  <li>
-    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
-program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
-along with collaboration partners working on
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>,
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>,
-<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and
-<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>.
-All of these projects are partially completed or to be completed in early 2025.</p>
+    <p>У 2023 та 2024 роках нас прийняли до програми Next Generation Internet (NGI) за нашу роботу над <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>, а також у співпраці з партнерами, які працюють над <a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>, <a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>, <a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> та <a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>. Усі ці проєкти частково завершені або будуть завершені на початку 2025 року.</p>
  </li>
  <li>
-    <p>In 2021 we received further EU funding for two Next-Generation-Internet
-proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+    <p>У 2021 році ми отримали подальше фінансування від ЄС на дві пропозиції щодо Інтернету наступного покоління а саме на <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - каталог перенесення провайдерів електронної пошти</a> (~97 тис. євро) та <a href="https://nlnet.nl/project/EmailPorting/">AEAP - перенесення адрес електронної пошти</a> (~90 тис. євро), що дозволило нам покращити багатопрофільну підтримку, вдосконалити налаштування контактів та груп за допомогою QR-коду та багато інших мережевих покращень на всіх платформах.</p>
  </li>
  <li>
-    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
-completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
+    <p>Фонд <a href="https://nlnet.nl/">NLnet</a> виділив у 2019/2020 роках 46 тисяч євро на
+завершення прив’язок Rust/Python та запуск екосистеми чат-ботів.</p>
  </li>
  <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p><a href="https://opentechfund.org">Open Technology Fund</a> надав нам два гранти. 
+Перший грант 2018/2019 року (~$200K), допоміг значно покращили додаток для Android
+і випустили першу бета-версію додатка для ПК, і який до того ж
+закріпив наші розробки функцій у дослідженнях UX у контексті прав людини, 
+дивіться наш підсумковий звіт <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
+Другий грант 2019/2020 року (~$300K) допоміг нам 
+випустити Delta/iOS версію, конвертувати нашу основному бібліотеку на Rust,
+і додати нові функції для всіх платформ.</p>
  </li>
  <li>
    <p>Проект ЄС <a href="https://nextleap.eu">NEXTLEAP</a> фінансував дослідження та впровадження верифікованих груп і протоколів встановлення контактів у 2017 та 2018 роках, а також допоміг інтегрувати наскрізне шифрування через <a href="https://autocrypt.org">Autocrypt</a>.</p>
@@ -14,7 +14,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;

 /* Basic RPC Transport implementation */ 
-public abstract class BaseTransport implements Rpc.Transport {
+public abstract class BaseRpcTransport implements Rpc.RpcTransport {
  private final Map<Integer, SettableFuture<JsonNode>> requestFutures = new ConcurrentHashMap<>();
  private int requestId = 0;
  private final ObjectMapper mapper = new ObjectMapper();
@@ -9,16 +9,16 @@ import chat.delta.rpc.types.*;

 public class Rpc {

-  public interface Transport {
+  public interface RpcTransport {
    void call(String method, JsonNode... params) throws RpcException;
    <T> T callForResult(TypeReference<T> resultType, String method, JsonNode... params) throws RpcException;
    ObjectMapper getObjectMapper();
  }

-  public final Transport transport;
+  public final RpcTransport transport;
  private final ObjectMapper mapper;

-  public Rpc(Transport transport) {
+  public Rpc(RpcTransport transport) {
    this.transport = transport;
    this.mapper = transport.getObjectMapper();
  }
@@ -53,6 +53,11 @@ public class Rpc {
    return transport.callForResult(new TypeReference<Event>(){}, "get_next_event");
  }

+  /** Waits for at least one event and return a batch of events. */
+  public java.util.List<Event> getNextEventBatch() throws RpcException {
+    return transport.callForResult(new TypeReference<java.util.List<Event>>(){}, "get_next_event_batch");
+  }
+
  public Integer addAccount() throws RpcException {
    return transport.callForResult(new TypeReference<Integer>(){}, "add_account");
  }
@@ -284,6 +289,7 @@ public class Rpc {
   * from a server encoded in a QR code.
   * - [Self::list_transports()] to get a list of all configured transports.
   * - [Self::delete_transport()] to remove a transport.
+   * - [Self::set_transport_unpublished()] to set whether contacts see this transport.
   */
  public void addOrUpdateTransport(Integer accountId, EnteredLoginParam param) throws RpcException {
    transport.call("add_or_update_transport", mapper.valueToTree(accountId), mapper.valueToTree(param));
@@ -307,11 +313,22 @@ public class Rpc {
   * Returns the list of all email accounts that are used as a transport in the current profile.
   * Use [Self::add_or_update_transport()] to add or change a transport
   * and [Self::delete_transport()] to delete a transport.
+   * Use [Self::list_transports_ex()] to additionally query
+   * whether the transports are marked as 'unpublished'.
   */
  public java.util.List<EnteredLoginParam> listTransports(Integer accountId) throws RpcException {
    return transport.callForResult(new TypeReference<java.util.List<EnteredLoginParam>>(){}, "list_transports", mapper.valueToTree(accountId));
  }

+  /**
+   * Returns the list of all email accounts that are used as a transport in the current profile.
+   * Use [Self::add_or_update_transport()] to add or change a transport
+   * and [Self::delete_transport()] to delete a transport.
+   */
+  public java.util.List<TransportListEntry> listTransportsEx(Integer accountId) throws RpcException {
+    return transport.callForResult(new TypeReference<java.util.List<TransportListEntry>>(){}, "list_transports_ex", mapper.valueToTree(accountId));
+  }
+
  /**
   * Removes the transport with the specified email address
   * (i.e. [EnteredLoginParam::addr]).
@@ -320,6 +337,22 @@ public class Rpc {
    transport.call("delete_transport", mapper.valueToTree(accountId), mapper.valueToTree(addr));
  }

+  /**
+   * Change whether the transport is unpublished.
+   * <p>
+   * Unpublished transports are not advertised to contacts,
+   * and self-sent messages are not sent there,
+   * so that we don't cause extra messages to the corresponding inbox,
+   * but can still receive messages from contacts who don't know our new transport addresses yet.
+   * <p>
+   * The default is false, but when the user updates from a version that didn't have this flag,
+   * existing secondary transports are set to unpublished,
+   * so that an existing transport address doesn't suddenly get spammed with a lot of messages.
+   */
+  public void setTransportUnpublished(Integer accountId, String addr, Boolean unpublished) throws RpcException {
+    transport.call("set_transport_unpublished", mapper.valueToTree(accountId), mapper.valueToTree(addr), mapper.valueToTree(unpublished));
+  }
+
  /** Signal an ongoing process to stop. */
  public void stopOngoingProcess(Integer accountId) throws RpcException {
    transport.call("stop_ongoing_process", mapper.valueToTree(accountId));
@@ -405,14 +438,6 @@ public class Rpc {
    return transport.callForResult(new TypeReference<Integer>(){}, "estimate_auto_deletion_count", mapper.valueToTree(accountId), mapper.valueToTree(fromServer), mapper.valueToTree(seconds));
  }

-  public String initiateAutocryptKeyTransfer(Integer accountId) throws RpcException {
-    return transport.callForResult(new TypeReference<String>(){}, "initiate_autocrypt_key_transfer", mapper.valueToTree(accountId));
-  }
-
-  public void continueAutocryptKeyTransfer(Integer accountId, Integer messageId, String setupCode) throws RpcException {
-    transport.call("continue_autocrypt_key_transfer", mapper.valueToTree(accountId), mapper.valueToTree(messageId), mapper.valueToTree(setupCode));
-  }
-
  public java.util.List<Integer> getChatlistEntries(Integer accountId, Integer listFlags, String queryString, Integer queryContactId) throws RpcException {
    return transport.callForResult(new TypeReference<java.util.List<Integer>>(){}, "get_chatlist_entries", mapper.valueToTree(accountId), mapper.valueToTree(listFlags), mapper.valueToTree(queryString), mapper.valueToTree(queryContactId));
  }
@@ -504,6 +529,8 @@ public class Rpc {
   * if `checkQr()` returns `askVerifyContact` or `askVerifyGroup`
   * an out-of-band-verification can be joined using `secure_join()`
   * <p>
+   * @deprecated as of 2026-03; use create_qr_svg(get_chat_securejoin_qr_code()) instead.
+   * <p>
   * chat_id: If set to a group-chat-id,
   * the Verified-Group-Invite protocol is offered in the QR code;
   * works for protected groups as well as for normal groups.
@@ -682,7 +709,8 @@ public class Rpc {
   * Set group name.
   * <p>
   * If the group is already _promoted_ (any message was sent to the group),
-   * all group members are informed by a special status message that is sent automatically by this function.
+   * or if this is a brodacast channel,
+   * all members are informed by a special status message that is sent automatically by this function.
   * <p>
   * Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
   */
@@ -690,11 +718,37 @@ public class Rpc {
    transport.call("set_chat_name", mapper.valueToTree(accountId), mapper.valueToTree(chatId), mapper.valueToTree(newName));
  }

+  /**
+   * Set group or broadcast channel description.
+   * <p>
+   * If the group is already _promoted_ (any message was sent to the group),
+   * or if this is a brodacast channel,
+   * all members are informed by a special status message that is sent automatically by this function.
+   * <p>
+   * Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
+   * <p>
+   * See also [`Self::get_chat_description`] / `getChatDescription()`.
+   */
+  public void setChatDescription(Integer accountId, Integer chatId, String description) throws RpcException {
+    transport.call("set_chat_description", mapper.valueToTree(accountId), mapper.valueToTree(chatId), mapper.valueToTree(description));
+  }
+
+  /**
+   * Load the chat description from the database.
+   * <p>
+   * UIs show this in the profile page of the chat,
+   * it is settable by [`Self::set_chat_description`] / `setChatDescription()`.
+   */
+  public String getChatDescription(Integer accountId, Integer chatId) throws RpcException {
+    return transport.callForResult(new TypeReference<String>(){}, "get_chat_description", mapper.valueToTree(accountId), mapper.valueToTree(chatId));
+  }
+
  /**
   * Set group profile image.
   * <p>
   * If the group is already _promoted_ (any message was sent to the group),
-   * all group members are informed by a special status message that is sent automatically by this function.
+   * or if this is a brodacast channel,
+   * all members are informed by a special status message that is sent automatically by this function.
   * <p>
   * Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
   * <p>
@@ -766,6 +820,16 @@ public class Rpc {
    transport.call("marknoticed_chat", mapper.valueToTree(accountId), mapper.valueToTree(chatId));
  }

+  /**
+   * Marks the last incoming message in the chat as _fresh_.
+   * <p>
+   * UI can use this to offer a "mark unread" option,
+   * so that already noticed chats get a badge counter again.
+   */
+  public void markfreshChat(Integer accountId, Integer chatId) throws RpcException {
+    transport.call("markfresh_chat", mapper.valueToTree(accountId), mapper.valueToTree(chatId));
+  }
+
  /**
   * Returns the message that is immediately followed by the last seen
   * message.
@@ -1179,12 +1243,19 @@ public class Rpc {
   * even if there is no concurrent call to [`CommandApi::provide_backup`],
   * but will fail after 60 seconds to avoid deadlocks.
   * <p>
+   * @deprecated as of 2026-03; use `create_qr_svg(get_backup_qr())` instead.
+   * <p>
   * Returns the QR code rendered as an SVG image.
   */
  public String getBackupQrSvg(Integer accountId) throws RpcException {
    return transport.callForResult(new TypeReference<String>(){}, "get_backup_qr_svg", mapper.valueToTree(accountId));
  }

+  /** Renders the given text as a QR code SVG image. */
+  public String createQrSvg(String text) throws RpcException {
+    return transport.callForResult(new TypeReference<String>(){}, "create_qr_svg", mapper.valueToTree(text));
+  }
+
  /**
   * Gets a backup from a remote provider.
   * <p>
@@ -1315,8 +1386,8 @@ public class Rpc {
  }

  /** Starts an outgoing call. */
-  public Integer placeOutgoingCall(Integer accountId, Integer chatId, String placeCallInfo) throws RpcException {
-    return transport.callForResult(new TypeReference<Integer>(){}, "place_outgoing_call", mapper.valueToTree(accountId), mapper.valueToTree(chatId), mapper.valueToTree(placeCallInfo));
+  public Integer placeOutgoingCall(Integer accountId, Integer chatId, String placeCallInfo, Boolean hasVideo) throws RpcException {
+    return transport.callForResult(new TypeReference<Integer>(){}, "place_outgoing_call", mapper.valueToTree(accountId), mapper.valueToTree(chatId), mapper.valueToTree(placeCallInfo), mapper.valueToTree(hasVideo));
  }

  /** Accepts an incoming call. */
@@ -2,7 +2,7 @@
 package chat.delta.rpc.types;

 public class CallInfo {
-  /** True if SDP offer has a video. */
+  /** True if the call is started as a video call. */
  public Boolean hasVideo;
  /**
   * SDP offer.
@@ -387,6 +387,8 @@ public abstract class EventType {
  public static class IncomingCallAccepted extends EventType {
    /** ID of the chat which the message belongs to. */
    public Integer chat_id;
+    /** The call was accepted from this device (process). */
+    public Boolean from_this_device;
    /** ID of the info message referring to the call. */
    public Integer msg_id;
  }
@@ -32,7 +32,6 @@ public class Message {
  public Boolean isEdited;
  public Boolean isForwarded;
  public Boolean isInfo;
-  public Boolean isSetupmessage;
  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
  public Integer originalMsgId;
  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
@@ -47,8 +46,6 @@ public class Message {
  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
  public Integer savedMessageId;
  public Contact sender;
-  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
-  public String setupCodeBegin;
  /**
   * True if the message was correctly encrypted&signed, false otherwise. Historically, UIs showed a small padlock on the message then.
   * <p>
@@ -42,7 +42,6 @@ public abstract class MessageLoadResult {
    public Boolean isEdited;
    public Boolean isForwarded;
    public Boolean isInfo;
-    public Boolean isSetupmessage;
    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
    public Integer originalMsgId;
    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
@@ -57,8 +56,6 @@ public abstract class MessageLoadResult {
    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
    public Integer savedMessageId;
    public Contact sender;
-    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
-    public String setupCodeBegin;
    /**
     * True if the message was correctly encrypted&signed, false otherwise. Historically, UIs showed a small padlock on the message then.
     * <p>
@@ -25,6 +25,8 @@ public abstract class Qr {
    public String fingerprint;
    /** Invite number. */
    public String invitenumber;
+    /** Whether the inviter supports the new Securejoin v3 protocol */
+    public Boolean is_v3;
  }

 /** Ask the user whether to join the group. */
@@ -41,6 +43,8 @@ public abstract class Qr {
    public String grpname;
    /** Invite number. */
    public String invitenumber;
+    /** Whether the inviter supports the new Securejoin v3 protocol */
+    public Boolean is_v3;
  }

 /** Ask the user whether to join the broadcast channel. */
@@ -55,6 +59,8 @@ public abstract class Qr {
    public String grpid;
    /** Invite number. */
    public String invitenumber;
+    /** Whether the inviter supports the new Securejoin v3 protocol */
+    public Boolean is_v3;
    /** The user-visible name of this broadcast channel */
    public String name;
  }
@@ -4,6 +4,7 @@ package chat.delta.rpc.types;
 public enum SystemMessageType {
  Unknown,
  GroupNameChanged,
+  GroupDescriptionChanged,
  GroupImageChanged,
  MemberAddedToGroup,
  MemberRemovedFromGroup,
@@ -0,0 +1,9 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public class TransportListEntry {
+  /** Whether this transport is set to 'unpublished'. See `set_transport_unpublished` / `setTransportUnpublished` for details. */
+  public Boolean isUnpublished;
+  /** The login data entered by the user. */
+  public EnteredLoginParam param;
+}
@@ -2,64 +2,92 @@ package com.b44t.messenger;

 public class DcAccounts {

-    public DcAccounts(String dir) {
-        accountsCPtr = createAccountsCPtr(dir);
-        if (accountsCPtr == 0) throw new RuntimeException("createAccountsCPtr() returned null pointer");
+  public DcAccounts(String dir, DcEventChannel channel) {
+    accountsCPtr = createAccountsCPtr(dir, channel);
+    if (accountsCPtr == 0) throw new RuntimeException("createAccountsCPtr() returned null pointer");
+  }
+
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+    unref();
+  }
+
+  public void unref() {
+    if (accountsCPtr != 0) {
+      unrefAccountsCPtr();
+      accountsCPtr = 0;
    }
+  }

-    @Override
-    protected void finalize() throws Throwable {
-        super.finalize();
-        unref();
+  public DcEventEmitter getEventEmitter() {
+    return new DcEventEmitter(getEventEmitterCPtr());
+  }
+
+  public DcJsonrpcInstance getJsonrpcInstance() {
+    return new DcJsonrpcInstance(getJsonrpcInstanceCPtr());
+  }
+
+  public void startIo() {
+    for (int accountId : getAll()) {
+      DcContext acc = getAccount(accountId);
+      if (acc.isEnabled()) {
+        acc.startIo();
+      }
    }
+  }
+  ;

-    public void unref() {
-        if (accountsCPtr != 0) {
-            unrefAccountsCPtr();
-            accountsCPtr = 0;
-        }
-    }
-
-    public DcEventEmitter         getEventEmitter      () { return new DcEventEmitter(getEventEmitterCPtr()); }
-    public DcJsonrpcInstance      getJsonrpcInstance   () { return new DcJsonrpcInstance(getJsonrpcInstanceCPtr()); }
-    public void            startIo              () {
-        for (int accountId : getAll()) {
-            DcContext acc = getAccount(accountId);
-            if (acc.isEnabled()) {
-                acc.startIo();
-            }
-        }
-    };
-    public native void            startIo2             ();
-    public native void            stopIo               ();
-    public native void            maybeNetwork         ();
-    public native void            setPushDeviceToken   (String token);
-    public native boolean         backgroundFetch      (int timeoutSeconds);
-    public native void            stopBackgroundFetch  ();
-
-    public native int             migrateAccount       (String dbfile);
-    public native boolean         removeAccount        (int accountId);
-    public native int[]           getAll               ();
-    public DcContext              getAccount           (int accountId) { return new DcContext(getAccountCPtr(accountId)); }
-    public DcContext              getSelectedAccount   () { return new DcContext(getSelectedAccountCPtr()); }
-    public native boolean         selectAccount        (int accountId);
-
-    // working with raw c-data
-    private long         accountsCPtr;          // CAVE: the name is referenced in the JNI
-    private native long  createAccountsCPtr     (String dir);
-    private native void  unrefAccountsCPtr      ();
-    private native long  getEventEmitterCPtr    ();
-    private native long  getJsonrpcInstanceCPtr ();
-    private native long  getAccountCPtr         (int accountId);
-    private native long  getSelectedAccountCPtr ();
-
-    public boolean isAllChatmail() {
-        for (int accountId : getAll()) {
-            DcContext dcContext = getAccount(accountId);
-            if (!dcContext.isChatmail()) {
-                return false;
-            }
-        }
-        return true;
+  public native void startIo2();
+
+  public native void stopIo();
+
+  public native void maybeNetwork();
+
+  public native void setPushDeviceToken(String token);
+
+  public native boolean backgroundFetch(int timeoutSeconds);
+
+  public native void stopBackgroundFetch();
+
+  public native int migrateAccount(String dbfile);
+
+  public native boolean removeAccount(int accountId);
+
+  public native int[] getAll();
+
+  public DcContext getAccount(int accountId) {
+    return new DcContext(getAccountCPtr(accountId));
+  }
+
+  public DcContext getSelectedAccount() {
+    return new DcContext(getSelectedAccountCPtr());
+  }
+
+  public native boolean selectAccount(int accountId);
+
+  // working with raw c-data
+  private long accountsCPtr; // CAVE: the name is referenced in the JNI
+
+  private native long createAccountsCPtr(String dir, DcEventChannel channel);
+
+  private native void unrefAccountsCPtr();
+
+  private native long getEventEmitterCPtr();
+
+  private native long getJsonrpcInstanceCPtr();
+
+  private native long getAccountCPtr(int accountId);
+
+  private native long getSelectedAccountCPtr();
+
+  public boolean isAllChatmail() {
+    for (int accountId : getAll()) {
+      DcContext dcContext = getAccount(accountId);
+      if (!dcContext.isChatmail()) {
+        return false;
+      }
    }
+    return true;
+  }
 }
@@ -2,31 +2,35 @@ package com.b44t.messenger;

 public class DcBackupProvider {

-    public DcBackupProvider(long backupProviderCPtr) {
-        this.backupProviderCPtr = backupProviderCPtr;
+  public DcBackupProvider(long backupProviderCPtr) {
+    this.backupProviderCPtr = backupProviderCPtr;
+  }
+
+  public boolean isOk() {
+    return backupProviderCPtr != 0;
+  }
+
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+    unref();
+  }
+
+  public void unref() {
+    if (backupProviderCPtr != 0) {
+      unrefBackupProviderCPtr();
+      backupProviderCPtr = 0;
    }
+  }

-    public boolean isOk() {
-      return backupProviderCPtr != 0;
-    }
+  public native String getQr();

-    @Override protected void finalize() throws Throwable {
-        super.finalize();
-        unref();
-    }
+  public native String getQrSvg();

-    public void unref() {
-        if (backupProviderCPtr != 0) {
-            unrefBackupProviderCPtr();
-            backupProviderCPtr = 0;
-        }
-    }
+  public native void waitForReceiver();

-    public native String    getQr           ();
-    public native String    getQrSvg        ();
-    public native void      waitForReceiver ();
+  // working with raw c-data
+  private long backupProviderCPtr; // CAVE: the name is referenced in the JNI

-    // working with raw c-data
-    private long        backupProviderCPtr;    // CAVE: the name is referenced in the JNI
-    private native void unrefBackupProviderCPtr();
+  private native void unrefBackupProviderCPtr();
 }
@@ -1,76 +1,109 @@
 package com.b44t.messenger;

+import org.thoughtcrime.securesms.util.Util;
+
 public class DcChat {

-    public static final int DC_CHAT_TYPE_UNDEFINED   = 0;
-    public static final int DC_CHAT_TYPE_SINGLE      = 100;
-    public static final int DC_CHAT_TYPE_GROUP       = 120;
-    public static final int DC_CHAT_TYPE_MAILINGLIST = 140;
-    public static final int DC_CHAT_TYPE_OUT_BROADCAST = 160;
-    public static final int DC_CHAT_TYPE_IN_BROADCAST = 165;
+  public static final int DC_CHAT_TYPE_UNDEFINED = 0;
+  public static final int DC_CHAT_TYPE_SINGLE = 100;
+  public static final int DC_CHAT_TYPE_GROUP = 120;
+  public static final int DC_CHAT_TYPE_MAILINGLIST = 140;
+  public static final int DC_CHAT_TYPE_OUT_BROADCAST = 160;
+  public static final int DC_CHAT_TYPE_IN_BROADCAST = 165;

-    public static final int DC_CHAT_NO_CHAT          = 0;
-    public final static int DC_CHAT_ID_ARCHIVED_LINK = 6;
-    public final static int DC_CHAT_ID_ALLDONE_HINT  = 7;
-    public final static int DC_CHAT_ID_LAST_SPECIAL  = 9;
+  public static final int DC_CHAT_NO_CHAT = 0;
+  public static final int DC_CHAT_ID_ARCHIVED_LINK = 6;
+  public static final int DC_CHAT_ID_ALLDONE_HINT = 7;
+  public static final int DC_CHAT_ID_LAST_SPECIAL = 9;

-    public final static int DC_CHAT_VISIBILITY_NORMAL   = 0;
-    public final static int DC_CHAT_VISIBILITY_ARCHIVED = 1;
-    public final static int DC_CHAT_VISIBILITY_PINNED   = 2;
+  public static final int DC_CHAT_VISIBILITY_NORMAL = 0;
+  public static final int DC_CHAT_VISIBILITY_ARCHIVED = 1;
+  public static final int DC_CHAT_VISIBILITY_PINNED = 2;

-    private int accountId;
+  private int accountId;

-    public DcChat(int accountId, long chatCPtr) {
-        this.accountId = accountId;
-        this.chatCPtr = chatCPtr;
+  public DcChat(int accountId, long chatCPtr) {
+    this.accountId = accountId;
+    this.chatCPtr = chatCPtr;
+  }
+
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+    unrefChatCPtr();
+    chatCPtr = 0;
+  }
+
+  public int getAccountId() {
+    return accountId;
+  }
+
+  public native int getId();
+
+  public native int getType();
+
+  public native int getVisibility();
+
+  public native String getName();
+
+  public native String getMailinglistAddr();
+
+  public native String getProfileImage();
+
+  public native int getColor();
+
+  public native boolean isEncrypted();
+
+  public native boolean isUnpromoted();
+
+  public native boolean isSelfTalk();
+
+  public native boolean isDeviceTalk();
+
+  public native boolean canSend();
+
+  public native boolean isSendingLocations();
+
+  public native boolean isMuted();
+
+  public native boolean isContactRequest();
+
+  // aliases and higher-level tools
+
+  public boolean isMultiUser() {
+    int type = getType();
+    return type != DC_CHAT_TYPE_SINGLE;
+  }
+
+  public boolean shallLeaveBeforeDelete(DcContext dcContext) {
+    if (isInBroadcast()) {
+      final int[] members = dcContext.getChatContacts(getId());
+      return Util.contains(members, DcContact.DC_CONTACT_ID_SELF);
+    } else if (isMultiUser() && isEncrypted() && canSend() && !isOutBroadcast()) {
+      return true;
    }
+    return false;
+  }

-  @Override protected void finalize() throws Throwable {
-        super.finalize();
-        unrefChatCPtr();
-        chatCPtr = 0;
-    }
+  public boolean isMailingList() {
+    return getType() == DC_CHAT_TYPE_MAILINGLIST;
+  }

-    public int            getAccountId      () { return accountId; }
-    public native int     getId             ();
-    public native int     getType           ();
-    public native int     getVisibility     ();
-    public native String  getName           ();
-    public native String  getMailinglistAddr();
-    public native String  getProfileImage   ();
-    public native int     getColor          ();
-    public native boolean isEncrypted       ();
-    public native boolean isUnpromoted      ();
-    public native boolean isSelfTalk        ();
-    public native boolean isDeviceTalk      ();
-    public native boolean canSend           ();
-    public native boolean isSendingLocations();
-    public native boolean isMuted           ();
-    public native boolean isContactRequest  ();
+  public boolean isInBroadcast() {
+    return getType() == DC_CHAT_TYPE_IN_BROADCAST;
+  }

+  public boolean isOutBroadcast() {
+    return getType() == DC_CHAT_TYPE_OUT_BROADCAST;
+  }

-    // aliases and higher-level tools
+  // working with raw c-data

-    public boolean isMultiUser() {
-      int type = getType();
-      return type != DC_CHAT_TYPE_SINGLE;
-    }
+  private long chatCPtr; // CAVE: the name is referenced in the JNI

-    public boolean isMailingList() {
-        return getType() == DC_CHAT_TYPE_MAILINGLIST;
-    }
-
-    public boolean isInBroadcast() {
-        return getType() == DC_CHAT_TYPE_IN_BROADCAST;
-    }
-    public boolean isOutBroadcast() {
-        return getType() == DC_CHAT_TYPE_OUT_BROADCAST;
-    }
-
-    // working with raw c-data
-
-    private long        chatCPtr;    // CAVE: the name is referenced in the JNI
-    private native void unrefChatCPtr();
-    public long         getChatCPtr  () { return chatCPtr; }
+  private native void unrefChatCPtr();

+  public long getChatCPtr() {
+    return chatCPtr;
+  }
 }
@@ -2,45 +2,64 @@ package com.b44t.messenger;

 public class DcChatlist {

-    private int accountId;
+  private int accountId;

-    public DcChatlist(int accountId, long chatlistCPtr) {
-        this.accountId = accountId;
-        this.chatlistCPtr = chatlistCPtr;
-    }
+  public DcChatlist(int accountId, long chatlistCPtr) {
+    this.accountId = accountId;
+    this.chatlistCPtr = chatlistCPtr;
+  }

-    @Override protected void finalize() throws Throwable {
-        super.finalize();
-        unrefChatlistCPtr();
-        chatlistCPtr = 0;
-    }
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+    unrefChatlistCPtr();
+    chatlistCPtr = 0;
+  }

-    public int              getAccountId() { return accountId; }
-    public native int       getCnt    ();
-    public native int       getChatId (int index);
-    public DcChat           getChat   (int index) { return new DcChat(accountId, getChatCPtr(index)); }
-    public native int       getMsgId  (int index);
-    public DcMsg            getMsg    (int index) { return new DcMsg(getMsgCPtr(index)); }
-    public DcLot            getSummary(int index, DcChat chat) { return new DcLot(getSummaryCPtr(index, chat==null? 0 : chat.getChatCPtr())); }
+  public int getAccountId() {
+    return accountId;
+  }

-    public class Item {
-        public DcLot summary;
-        public int   msgId;
-        public int   chatId;
-    }
+  public native int getCnt();

-    public Item getItem(int index) {
-        Item item = new Item();
-        item.summary = getSummary(index, null);
-        item.msgId   = getMsgId(index);
-        item.chatId  = getChatId(index);
-        return item;
-    }
+  public native int getChatId(int index);

-    // working with raw c-data
-    private long        chatlistCPtr;    // CAVE: the name is referenced in the JNI
-    private native void unrefChatlistCPtr();
-    private native long getChatCPtr      (int index);
-    private native long getMsgCPtr       (int index);
-    private native long getSummaryCPtr   (int index, long chatCPtr);
+  public DcChat getChat(int index) {
+    return new DcChat(accountId, getChatCPtr(index));
+  }
+
+  public native int getMsgId(int index);
+
+  public DcMsg getMsg(int index) {
+    return new DcMsg(getMsgCPtr(index));
+  }
+
+  public DcLot getSummary(int index, DcChat chat) {
+    return new DcLot(getSummaryCPtr(index, chat == null ? 0 : chat.getChatCPtr()));
+  }
+
+  public class Item {
+    public DcLot summary;
+    public int msgId;
+    public int chatId;
+  }
+
+  public Item getItem(int index) {
+    Item item = new Item();
+    item.summary = getSummary(index, null);
+    item.msgId = getMsgId(index);
+    item.chatId = getChatId(index);
+    return item;
+  }
+
+  // working with raw c-data
+  private long chatlistCPtr; // CAVE: the name is referenced in the JNI
+
+  private native void unrefChatlistCPtr();
+
+  private native long getChatCPtr(int index);
+
+  private native long getMsgCPtr(int index);
+
+  private native long getSummaryCPtr(int index, long chatCPtr);
 }
@@ -2,67 +2,82 @@ package com.b44t.messenger;

 public class DcContact {

-    public final static int DC_CONTACT_ID_SELF               = 1;
-    public final static int DC_CONTACT_ID_INFO               = 2;
-    public final static int DC_CONTACT_ID_DEVICE             = 5;
-    public final static int DC_CONTACT_ID_LAST_SPECIAL       = 9;
-    public final static int DC_CONTACT_ID_NEW_CLASSIC_CONTACT= -1; // used by the UI, not valid to the core
-    public final static int DC_CONTACT_ID_NEW_GROUP          = -2; //      - " -
-    public final static int DC_CONTACT_ID_ADD_MEMBER         = -3; //      - " -
-    public final static int DC_CONTACT_ID_QR_INVITE          = -4; //      - " -
-    public final static int DC_CONTACT_ID_NEW_BROADCAST      = -5; //   - " -
-    public final static int DC_CONTACT_ID_ADD_ACCOUNT        = -6; //      - " -
-    public final static int DC_CONTACT_ID_NEW_UNENCRYPTED_GROUP = -7; //      - " -
+  public static final int DC_CONTACT_ID_SELF = 1;
+  public static final int DC_CONTACT_ID_INFO = 2;
+  public static final int DC_CONTACT_ID_DEVICE = 5;
+  public static final int DC_CONTACT_ID_LAST_SPECIAL = 9;
+  public static final int DC_CONTACT_ID_NEW_CLASSIC_CONTACT =
+      -1; // used by the UI, not valid to the core
+  public static final int DC_CONTACT_ID_NEW_GROUP = -2; //      - " -
+  public static final int DC_CONTACT_ID_ADD_MEMBER = -3; //      - " -
+  public static final int DC_CONTACT_ID_QR_INVITE = -4; //      - " -
+  public static final int DC_CONTACT_ID_NEW_BROADCAST = -5; //   - " -
+  public static final int DC_CONTACT_ID_ADD_ACCOUNT = -6; //      - " -
+  public static final int DC_CONTACT_ID_NEW_UNENCRYPTED_GROUP = -7; //      - " -

-    public DcContact(long contactCPtr) {
-        this.contactCPtr = contactCPtr;
+  public DcContact(long contactCPtr) {
+    this.contactCPtr = contactCPtr;
+  }
+
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+    unrefContactCPtr();
+    contactCPtr = 0;
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    if (other == null || !(other instanceof DcContact)) {
+      return false;
    }

-    @Override
-    protected void finalize() throws Throwable {
-        super.finalize();
-        unrefContactCPtr();
-        contactCPtr = 0;
-    }
+    DcContact that = (DcContact) other;
+    return this.getId() == that.getId();
+  }

+  @Override
+  public int hashCode() {
+    return this.getId();
+  }

-    @Override
-    public boolean equals(Object other) {
-        if (other == null || !(other instanceof DcContact)) {
-            return false;
-        }
+  @Override
+  public String toString() {
+    return getAddr();
+  }

-        DcContact that = (DcContact) other;
-        return this.getId()==that.getId();
-    }
+  public native int getId();

-    @Override
-    public int hashCode() {
-        return this.getId();
-    }
+  public native String getName();

-    @Override
-    public String toString() {
-        return getAddr();
-    }
+  public native String getAuthName();

-    public native int     getId          ();
-    public native String  getName        ();
-    public native String  getAuthName    ();
-    public native String  getDisplayName ();
-    public native String  getAddr        ();
-    public native String  getProfileImage();
-    public native int     getColor       ();
-    public native String  getStatus      ();
-    public native long    getLastSeen    ();
-    public native boolean wasSeenRecently();
-    public native boolean isBlocked      ();
-    public native boolean isVerified     ();
-    public native boolean isKeyContact   ();
-    public native int     getVerifierId  ();
-    public native boolean isBot          ();
+  public native String getDisplayName();

-    // working with raw c-data
-    private long        contactCPtr;    // CAVE: the name is referenced in the JNI
-    private native void unrefContactCPtr();
+  public native String getAddr();
+
+  public native String getProfileImage();
+
+  public native int getColor();
+
+  public native String getStatus();
+
+  public native long getLastSeen();
+
+  public native boolean wasSeenRecently();
+
+  public native boolean isBlocked();
+
+  public native boolean isVerified();
+
+  public native boolean isKeyContact();
+
+  public native int getVerifierId();
+
+  public native boolean isBot();
+
+  // working with raw c-data
+  private long contactCPtr; // CAVE: the name is referenced in the JNI
+
+  private native void unrefContactCPtr();
 }
@@ -2,288 +2,413 @@ package com.b44t.messenger;

 public class DcContext {

-    public final static int DC_EVENT_INFO                        = 100;
-    public final static int DC_EVENT_WARNING                     = 300;
-    public final static int DC_EVENT_ERROR                       = 400;
-    public final static int DC_EVENT_ERROR_SELF_NOT_IN_GROUP     = 410;
-    public final static int DC_EVENT_MSGS_CHANGED                = 2000;
-    public final static int DC_EVENT_REACTIONS_CHANGED           = 2001;
-    public final static int DC_EVENT_INCOMING_REACTION           = 2002;
-    public final static int DC_EVENT_INCOMING_WEBXDC_NOTIFY      = 2003;
-    public final static int DC_EVENT_INCOMING_MSG                = 2005;
-    public final static int DC_EVENT_MSGS_NOTICED                = 2008;
-    public final static int DC_EVENT_MSG_DELIVERED               = 2010;
-    public final static int DC_EVENT_MSG_FAILED                  = 2012;
-    public final static int DC_EVENT_MSG_READ                    = 2015;
-    public final static int DC_EVENT_CHAT_MODIFIED               = 2020;
-    public final static int DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED = 2021;
-    public final static int DC_EVENT_CHAT_DELETED                = 2023;
-    public final static int DC_EVENT_CONTACTS_CHANGED            = 2030;
-    public final static int DC_EVENT_LOCATION_CHANGED            = 2035;
-    public final static int DC_EVENT_CONFIGURE_PROGRESS          = 2041;
-    public final static int DC_EVENT_IMEX_PROGRESS               = 2051;
-    public final static int DC_EVENT_IMEX_FILE_WRITTEN           = 2052;
-    public final static int DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060;
-    public final static int DC_EVENT_SECUREJOIN_JOINER_PROGRESS  = 2061;
-    public final static int DC_EVENT_CONNECTIVITY_CHANGED        = 2100;
-    public final static int DC_EVENT_SELFAVATAR_CHANGED          = 2110;
-    public final static int DC_EVENT_WEBXDC_STATUS_UPDATE        = 2120;
-    public final static int DC_EVENT_WEBXDC_INSTANCE_DELETED     = 2121;
-    public final static int DC_EVENT_WEBXDC_REALTIME_DATA        = 2150;
-    public final static int DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE = 2200;
-    public final static int DC_EVENT_INCOMING_CALL               = 2550;
-    public final static int DC_EVENT_INCOMING_CALL_ACCEPTED      = 2560;
-    public final static int DC_EVENT_OUTGOING_CALL_ACCEPTED      = 2570;
-    public final static int DC_EVENT_CALL_ENDED                  = 2580;
-    public final static int DC_EVENT_TRANSPORTS_MODIFIED         = 2600;
+  public static final int DC_EVENT_INFO = 100;
+  public static final int DC_EVENT_WARNING = 300;
+  public static final int DC_EVENT_ERROR = 400;
+  public static final int DC_EVENT_ERROR_SELF_NOT_IN_GROUP = 410;
+  public static final int DC_EVENT_MSGS_CHANGED = 2000;
+  public static final int DC_EVENT_REACTIONS_CHANGED = 2001;
+  public static final int DC_EVENT_INCOMING_REACTION = 2002;
+  public static final int DC_EVENT_INCOMING_WEBXDC_NOTIFY = 2003;
+  public static final int DC_EVENT_INCOMING_MSG = 2005;
+  public static final int DC_EVENT_MSGS_NOTICED = 2008;
+  public static final int DC_EVENT_MSG_DELIVERED = 2010;
+  public static final int DC_EVENT_MSG_FAILED = 2012;
+  public static final int DC_EVENT_MSG_READ = 2015;
+  public static final int DC_EVENT_MSG_DELETED = 2016;
+  public static final int DC_EVENT_CHAT_MODIFIED = 2020;
+  public static final int DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED = 2021;
+  public static final int DC_EVENT_CHAT_DELETED = 2023;
+  public static final int DC_EVENT_CONTACTS_CHANGED = 2030;
+  public static final int DC_EVENT_LOCATION_CHANGED = 2035;
+  public static final int DC_EVENT_CONFIGURE_PROGRESS = 2041;
+  public static final int DC_EVENT_IMEX_PROGRESS = 2051;
+  public static final int DC_EVENT_IMEX_FILE_WRITTEN = 2052;
+  public static final int DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060;
+  public static final int DC_EVENT_SECUREJOIN_JOINER_PROGRESS = 2061;
+  public static final int DC_EVENT_CONNECTIVITY_CHANGED = 2100;
+  public static final int DC_EVENT_SELFAVATAR_CHANGED = 2110;
+  public static final int DC_EVENT_WEBXDC_STATUS_UPDATE = 2120;
+  public static final int DC_EVENT_WEBXDC_INSTANCE_DELETED = 2121;
+  public static final int DC_EVENT_WEBXDC_REALTIME_DATA = 2150;
+  public static final int DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE = 2200;
+  public static final int DC_EVENT_INCOMING_CALL = 2550;
+  public static final int DC_EVENT_INCOMING_CALL_ACCEPTED = 2560;
+  public static final int DC_EVENT_OUTGOING_CALL_ACCEPTED = 2570;
+  public static final int DC_EVENT_CALL_ENDED = 2580;
+  public static final int DC_EVENT_TRANSPORTS_MODIFIED = 2600;

-    public final static int DC_IMEX_EXPORT_SELF_KEYS = 1;
-    public final static int DC_IMEX_IMPORT_SELF_KEYS = 2;
-    public final static int DC_IMEX_EXPORT_BACKUP    = 11;
-    public final static int DC_IMEX_IMPORT_BACKUP    = 12;
+  public static final int DC_IMEX_EXPORT_SELF_KEYS = 1;
+  public static final int DC_IMEX_IMPORT_SELF_KEYS = 2;
+  public static final int DC_IMEX_EXPORT_BACKUP = 11;
+  public static final int DC_IMEX_IMPORT_BACKUP = 12;

-    public final static int DC_GCL_VERIFIED_ONLY    = 1;
-    public final static int DC_GCL_ADD_SELF         = 2;
-    public final static int DC_GCL_ADDRESS          = 0x04;
-    public final static int DC_GCL_ARCHIVED_ONLY    = 0x01;
-    public final static int DC_GCL_NO_SPECIALS      = 0x02;
-    public final static int DC_GCL_ADD_ALLDONE_HINT = 0x04;
-    public final static int DC_GCL_FOR_FORWARDING   = 0x08;
+  public static final int DC_GCL_VERIFIED_ONLY = 1;
+  public static final int DC_GCL_ADD_SELF = 2;
+  public static final int DC_GCL_ADDRESS = 0x04;
+  public static final int DC_GCL_ARCHIVED_ONLY = 0x01;
+  public static final int DC_GCL_NO_SPECIALS = 0x02;
+  public static final int DC_GCL_ADD_ALLDONE_HINT = 0x04;
+  public static final int DC_GCL_FOR_FORWARDING = 0x08;

-    public final static int DC_GCM_ADDDAYMARKER = 0x01;
+  public static final int DC_GCM_ADDDAYMARKER = 0x01;

-    public final static int DC_QR_ASK_VERIFYCONTACT = 200;
-    public final static int DC_QR_ASK_VERIFYGROUP   = 202;
-    public final static int DC_QR_ASK_JOIN_BROADCAST= 204;
-    public final static int DC_QR_FPR_OK            = 210;
-    public final static int DC_QR_FPR_MISMATCH      = 220;
-    public final static int DC_QR_FPR_WITHOUT_ADDR  = 230;
-    public final static int DC_QR_ACCOUNT           = 250;
-    public final static int DC_QR_BACKUP2           = 252;
-    public final static int DC_QR_BACKUP_TOO_NEW    = 255;
-    public final static int DC_QR_WEBRTC            = 260;
-    public final static int DC_QR_PROXY             = 271;
-    public final static int DC_QR_ADDR              = 320;
-    public final static int DC_QR_TEXT              = 330;
-    public final static int DC_QR_URL               = 332;
-    public final static int DC_QR_ERROR             = 400;
-    public final static int DC_QR_WITHDRAW_VERIFYCONTACT = 500;
-    public final static int DC_QR_WITHDRAW_VERIFYGROUP   = 502;
-    public final static int DC_QR_WITHDRAW_JOINBROADCAST = 504;
-    public final static int DC_QR_REVIVE_VERIFYCONTACT   = 510;
-    public final static int DC_QR_REVIVE_VERIFYGROUP     = 512;
-    public final static int DC_QR_REVIVE_JOINBROADCAST   = 514;
-    public final static int DC_QR_LOGIN             = 520;
+  public static final int DC_QR_ASK_VERIFYCONTACT = 200;
+  public static final int DC_QR_ASK_VERIFYGROUP = 202;
+  public static final int DC_QR_ASK_JOIN_BROADCAST = 204;
+  public static final int DC_QR_FPR_OK = 210;
+  public static final int DC_QR_FPR_MISMATCH = 220;
+  public static final int DC_QR_FPR_WITHOUT_ADDR = 230;
+  public static final int DC_QR_ACCOUNT = 250;
+  public static final int DC_QR_BACKUP2 = 252;
+  public static final int DC_QR_BACKUP_TOO_NEW = 255;
+  public static final int DC_QR_WEBRTC = 260;
+  public static final int DC_QR_PROXY = 271;
+  public static final int DC_QR_ADDR = 320;
+  public static final int DC_QR_TEXT = 330;
+  public static final int DC_QR_URL = 332;
+  public static final int DC_QR_ERROR = 400;
+  public static final int DC_QR_WITHDRAW_VERIFYCONTACT = 500;
+  public static final int DC_QR_WITHDRAW_VERIFYGROUP = 502;
+  public static final int DC_QR_WITHDRAW_JOINBROADCAST = 504;
+  public static final int DC_QR_REVIVE_VERIFYCONTACT = 510;
+  public static final int DC_QR_REVIVE_VERIFYGROUP = 512;
+  public static final int DC_QR_REVIVE_JOINBROADCAST = 514;
+  public static final int DC_QR_LOGIN = 520;

-    public final static int DC_SOCKET_AUTO     = 0;
-    public final static int DC_SOCKET_SSL      = 1;
-    public final static int DC_SOCKET_STARTTLS = 2;
-    public final static int DC_SOCKET_PLAIN    = 3;
+  public static final int DC_SOCKET_AUTO = 0;
+  public static final int DC_SOCKET_SSL = 1;
+  public static final int DC_SOCKET_STARTTLS = 2;
+  public static final int DC_SOCKET_PLAIN = 3;

-    public final static int DC_SHOW_EMAILS_OFF               = 0;
-    public final static int DC_SHOW_EMAILS_ACCEPTED_CONTACTS = 1;
-    public final static int DC_SHOW_EMAILS_ALL               = 2;
+  public static final int DC_SHOW_EMAILS_OFF = 0;
+  public static final int DC_SHOW_EMAILS_ACCEPTED_CONTACTS = 1;
+  public static final int DC_SHOW_EMAILS_ALL = 2;

-    public final static int DC_MEDIA_QUALITY_BALANCED = 0;
-    public final static int DC_MEDIA_QUALITY_WORSE    = 1;
+  public static final int DC_MEDIA_QUALITY_BALANCED = 0;
+  public static final int DC_MEDIA_QUALITY_WORSE = 1;

-    public final static int DC_CONNECTIVITY_NOT_CONNECTED = 1000;
-    public final static int DC_CONNECTIVITY_CONNECTING = 2000;
-    public final static int DC_CONNECTIVITY_WORKING = 3000;
-    public final static int DC_CONNECTIVITY_CONNECTED = 4000;
+  public static final int DC_CONNECTIVITY_NOT_CONNECTED = 1000;
+  public static final int DC_CONNECTIVITY_CONNECTING = 2000;
+  public static final int DC_CONNECTIVITY_WORKING = 3000;
+  public static final int DC_CONNECTIVITY_CONNECTED = 4000;

-    private static final String CONFIG_ACCOUNT_ENABLED = "ui.enabled";
-    private static final String CONFIG_MUTE_MENTIONS_IF_MUTED = "ui.mute_mentions_if_muted";
+  private static final String CONFIG_ACCOUNT_ENABLED = "ui.enabled";
+  private static final String CONFIG_MUTE_MENTIONS_IF_MUTED = "ui.mute_mentions_if_muted";

-    // when using DcAccounts, use Rpc.addAccount() instead
-    public DcContext(String osName, String dbfile) {
-        contextCPtr = createContextCPtr(osName, dbfile);
+  // when using DcAccounts, use Rpc.addAccount() instead
+  public DcContext(String osName, String dbfile) {
+    contextCPtr = createContextCPtr(osName, dbfile);
+  }
+
+  public DcContext(long contextCPtr) {
+    this.contextCPtr = contextCPtr;
+  }
+
+  public boolean isOk() {
+    return contextCPtr != 0;
+  }
+
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+    if (contextCPtr != 0) {
+      unrefContextCPtr();
+      contextCPtr = 0;
    }
+  }

-    public DcContext(long contextCPtr) {
-        this.contextCPtr = contextCPtr;
+  public native int getAccountId();
+
+  // when using DcAccounts, use DcAccounts.getEventEmitter() instead
+  public DcEventEmitter getEventEmitter() {
+    return new DcEventEmitter(getEventEmitterCPtr());
+  }
+
+  public native void setStockTranslation(int stockId, String translation);
+
+  public native String getBlobdir();
+
+  public native String getLastError();
+
+  public native void stopOngoingProcess();
+
+  public native int isConfigured();
+
+  public native boolean open(String passphrase);
+
+  public native boolean isOpen();
+
+  // when using DcAccounts, use DcAccounts.startIo() instead
+  public native void startIo();
+
+  // when using DcAccounts, use DcAccounts.stopIo() instead
+  public native void stopIo();
+
+  // when using DcAccounts, use DcAccounts.maybeNetwork() instead
+  public native void maybeNetwork();
+
+  public native void setConfig(String key, String value);
+
+  public void setConfigInt(String key, int value) {
+    setConfig(key, Integer.toString(value));
+  }
+
+  public native boolean setConfigFromQr(String qr);
+
+  public native String getConfig(String key);
+
+  public int getConfigInt(String key) {
+    return getConfigInt(key, 0);
+  }
+
+  public int getConfigInt(String key, int defValue) {
+    try {
+      return Integer.parseInt(getConfig(key));
+    } catch (Exception e) {
    }
+    return defValue;
+  }

-    public boolean isOk() {
-        return contextCPtr != 0;
-    }
+  public native String getInfo();

-    @Override
-    protected void finalize() throws Throwable {
-        super.finalize();
-        if (contextCPtr != 0) {
-            unrefContextCPtr();
-            contextCPtr = 0;
-        }
-    }
+  public native int getConnectivity();

-    public native int          getAccountId         ();
+  public native String getConnectivityHtml();

-    // when using DcAccounts, use DcAccounts.getEventEmitter() instead
-    public DcEventEmitter      getEventEmitter      () { return new DcEventEmitter(getEventEmitterCPtr()); }
+  public native void imex(int what, String dir);

-    public native void         setStockTranslation  (int stockId, String translation);
-    public native String       getBlobdir           ();
-    public native String       getLastError         ();
-    public native void         stopOngoingProcess   ();
-    public native int          isConfigured         ();
-    public native boolean      open                 (String passphrase);
-    public native boolean      isOpen               ();
+  public native String imexHasBackup(String dir);

-    // when using DcAccounts, use DcAccounts.startIo() instead
-    public native void         startIo              ();
+  public DcBackupProvider newBackupProvider() {
+    return new DcBackupProvider(newBackupProviderCPtr());
+  }

-    // when using DcAccounts, use DcAccounts.stopIo() instead
-    public native void         stopIo               ();
+  public native boolean receiveBackup(String qr);

-    // when using DcAccounts, use DcAccounts.maybeNetwork() instead
-    public native void         maybeNetwork         ();
+  public native boolean mayBeValidAddr(String addr);

-    public native void         setConfig            (String key, String value);
-    public void                setConfigInt         (String key, int value) { setConfig(key, Integer.toString(value)); }
-    public native boolean      setConfigFromQr      (String qr);
-    public native String       getConfig            (String key);
-    public int                 getConfigInt         (String key) { return getConfigInt(key, 0); }
-    public int                 getConfigInt         (String key, int defValue) { try{return Integer.parseInt(getConfig(key));} catch(Exception e) {} return defValue; }
-    public native String       getInfo              ();
-    public native int          getConnectivity      ();
-    public native String       getConnectivityHtml  ();
-    public native String       initiateKeyTransfer  ();
-    public native void         imex                 (int what, String dir);
-    public native String       imexHasBackup        (String dir);
-    public DcBackupProvider    newBackupProvider    () { return new DcBackupProvider(newBackupProviderCPtr()); }
-    public native boolean      receiveBackup        (String qr);
-    public native boolean      mayBeValidAddr       (String addr);
-    public native int          lookupContactIdByAddr(String addr);
-    public native int[]        getContacts          (int flags, String query);
-    public native int[]        getBlockedContacts   ();
-    public DcContact           getContact           (int contact_id) { return new DcContact(getContactCPtr(contact_id)); }
-    public native int          createContact        (String name, String addr);
-    public native void         blockContact         (int id, int block);
-    public native String       getContactEncrInfo   (int contact_id);
-    public native boolean      deleteContact        (int id);
-    public native int          addAddressBook       (String adrbook);
-    public DcChatlist          getChatlist          (int listflags, String query, int queryId) { return new DcChatlist(getAccountId(), getChatlistCPtr(listflags, query, queryId)); }
-    public DcChat              getChat              (int chat_id) { return new DcChat(getAccountId(), getChatCPtr(chat_id)); }
-    public native String       getChatEncrInfo      (int chat_id);
-    public native void         markseenMsgs         (int msg_ids[]);
-    public native void         marknoticedChat      (int chat_id);
-    public native void         setChatVisibility    (int chat_id, int visibility);
-    public native int          getChatIdByContactId (int contact_id);
-    public native int          createChatByContactId(int contact_id);
-    public native int          createGroupChat      (String name);
-    public native int          createBroadcastList  ();
-    public native boolean      isContactInChat      (int chat_id, int contact_id);
-    public native int          addContactToChat     (int chat_id, int contact_id);
-    public native int          removeContactFromChat(int chat_id, int contact_id);
-    public native void         setDraft             (int chat_id, DcMsg msg/*null=delete*/);
-    public DcMsg               getDraft             (int chat_id) { return new DcMsg(getDraftCPtr(chat_id)); }
-    public native int          setChatName          (int chat_id, String name);
-    public native int          setChatProfileImage  (int chat_id, String name);
-    public native int[]        getChatMsgs          (int chat_id, int flags, int marker1before);
-    public native int[]        searchMsgs           (int chat_id, String query);
-    public native int[]        getFreshMsgs         ();
-    public native int[]        getChatMedia         (int chat_id, int type1, int type2, int type3);
-    public native int[]        getChatContacts      (int chat_id);
-    public native int          getChatEphemeralTimer (int chat_id);
-    public native boolean      setChatEphemeralTimer (int chat_id, int timer);
-    public native boolean      setChatMuteDuration  (int chat_id, long duration);
-    public native void         deleteChat           (int chat_id);
-    public native void         blockChat            (int chat_id);
-    public native void         acceptChat           (int chat_id);
-    public DcMsg               getMsg               (int msg_id) { return new DcMsg(getMsgCPtr(msg_id)); }
-    public native void         sendEditRequest      (int msg_id, String text);
-    public native String       getMsgInfo           (int id);
-    public native String       getMsgHtml           (int msg_id);
-    public native void         downloadFullMsg      (int msg_id);
-    public native int          getFreshMsgCount     (int chat_id);
-    public native int          estimateDeletionCount(boolean from_server, long seconds);
-    public native void         deleteMsgs           (int msg_ids[]);
-    public native void         sendDeleteRequest    (int msg_ids[]);
-    public native void         forwardMsgs          (int msg_ids[], int chat_id);
-    public native void         saveMsgs             (int msg_ids[]);
-    public native boolean      resendMsgs           (int msg_ids[]);
-    public native int          sendMsg              (int chat_id, DcMsg msg);
-    public native int          sendTextMsg          (int chat_id, String text);
-    public native boolean      sendWebxdcStatusUpdate(int msg_id, String payload);
-    public native String       getWebxdcStatusUpdates(int msg_id, int last_known_serial);
-    public native void         setWebxdcIntegration (String file);
-    public native int          initWebxdcIntegration(int chat_id);
-    public native int          addDeviceMsg         (String label, DcMsg msg);
-    public native boolean      wasDeviceMsgEverAdded(String label);
-    public DcLot               checkQr              (String qr) { return new DcLot(checkQrCPtr(qr)); }
-    public native String       getSecurejoinQr      (int chat_id);
-    public native String       getSecurejoinQrSvg   (int chat_id);
-    public native String       createQrSvg          (String payload);
-    public native int          joinSecurejoin       (String qr);
-    public native void         sendLocationsToChat  (int chat_id, int seconds);
-    public native boolean      isSendingLocationsToChat(int chat_id);
-    public DcProvider          getProviderFromEmailWithDns (String email) { long cptr = getProviderFromEmailWithDnsCPtr(email); return cptr!=0 ? new DcProvider(cptr) : null; }
+  public native int lookupContactIdByAddr(String addr);

-    public boolean isEnabled() {
-      return !"0".equals(getConfig(CONFIG_ACCOUNT_ENABLED));
-    }
+  public native int[] getContacts(int flags, String query);

-    public void setEnabled(boolean enabled) {
-      setConfigInt(CONFIG_ACCOUNT_ENABLED, enabled? 1 : 0);
-      if (enabled) {
-        startIo();
-      } else {
-        stopIo();
-      }
-    }
+  public native int[] getBlockedContacts();

-    public boolean isMentionsEnabled() {
-      return getConfigInt(CONFIG_MUTE_MENTIONS_IF_MUTED) != 1;
-    }
+  public DcContact getContact(int contact_id) {
+    return new DcContact(getContactCPtr(contact_id));
+  }

-    public void setMentionsEnabled(boolean enabled) {
-      setConfigInt(CONFIG_MUTE_MENTIONS_IF_MUTED, enabled? 0 : 1);
-    }
+  public native int createContact(String name, String addr);

-    public String getName() {
-      String displayname = getConfig("displayname");
-      if (displayname.isEmpty()) {
-        displayname = getContact(DcContact.DC_CONTACT_ID_SELF).getAddr();
-      }
-      return displayname;
-    }
+  public native void blockContact(int id, int block);

-    public boolean isChatmail() {
-      return getConfigInt("is_chatmail") == 1;
-    }
+  public native String getContactEncrInfo(int contact_id);

-    public boolean isMuted() {
-      return getConfigInt("is_muted") == 1;
-    }
+  public native boolean deleteContact(int id);

-    public void setMuted(boolean muted) {
-      setConfigInt("is_muted", muted? 1 : 0);
-    }
+  public native int addAddressBook(String adrbook);

-    public void restartIo() {
-      if (!isEnabled()) return;
-      stopIo();
+  public DcChatlist getChatlist(int listflags, String query, int queryId) {
+    return new DcChatlist(getAccountId(), getChatlistCPtr(listflags, query, queryId));
+  }
+
+  public DcChat getChat(int chat_id) {
+    return new DcChat(getAccountId(), getChatCPtr(chat_id));
+  }
+
+  public native String getChatEncrInfo(int chat_id);
+
+  public native void markseenMsgs(int msg_ids[]);
+
+  public native void marknoticedChat(int chat_id);
+
+  public native void setChatVisibility(int chat_id, int visibility);
+
+  public native int getChatIdByContactId(int contact_id);
+
+  public native int createChatByContactId(int contact_id);
+
+  public native int createGroupChat(String name);
+
+  public native int createBroadcastList();
+
+  public native boolean isContactInChat(int chat_id, int contact_id);
+
+  public native int addContactToChat(int chat_id, int contact_id);
+
+  public native int removeContactFromChat(int chat_id, int contact_id);
+
+  public native void setDraft(int chat_id, DcMsg msg /*null=delete*/);
+
+  public DcMsg getDraft(int chat_id) {
+    return new DcMsg(getDraftCPtr(chat_id));
+  }
+
+  public native int setChatName(int chat_id, String name);
+
+  public native int setChatProfileImage(int chat_id, String name);
+
+  public native int[] getChatMsgs(int chat_id, int flags, int marker1before);
+
+  public native int[] searchMsgs(int chat_id, String query);
+
+  public native int[] getFreshMsgs();
+
+  public native int[] getChatMedia(int chat_id, int type1, int type2, int type3);
+
+  public native int[] getChatContacts(int chat_id);
+
+  public native int getChatEphemeralTimer(int chat_id);
+
+  public native boolean setChatEphemeralTimer(int chat_id, int timer);
+
+  public native boolean setChatMuteDuration(int chat_id, long duration);
+
+  public native void deleteChat(int chat_id);
+
+  public native void blockChat(int chat_id);
+
+  public native void acceptChat(int chat_id);
+
+  public DcMsg getMsg(int msg_id) {
+    return new DcMsg(getMsgCPtr(msg_id));
+  }
+
+  public native void sendEditRequest(int msg_id, String text);
+
+  public native String getMsgInfo(int id);
+
+  public native String getMsgHtml(int msg_id);
+
+  public native void downloadFullMsg(int msg_id);
+
+  public native int getFreshMsgCount(int chat_id);
+
+  public native int estimateDeletionCount(boolean from_server, long seconds);
+
+  public native void deleteMsgs(int msg_ids[]);
+
+  public native void sendDeleteRequest(int msg_ids[]);
+
+  public native void forwardMsgs(int msg_ids[], int chat_id);
+
+  public native void saveMsgs(int msg_ids[]);
+
+  public native boolean resendMsgs(int msg_ids[]);
+
+  public native int sendMsg(int chat_id, DcMsg msg);
+
+  public native int sendTextMsg(int chat_id, String text);
+
+  public native boolean sendWebxdcStatusUpdate(int msg_id, String payload);
+
+  public native String getWebxdcStatusUpdates(int msg_id, int last_known_serial);
+
+  public native void setWebxdcIntegration(String file);
+
+  public native int initWebxdcIntegration(int chat_id);
+
+  public native int addDeviceMsg(String label, DcMsg msg);
+
+  public native boolean wasDeviceMsgEverAdded(String label);
+
+  public DcLot checkQr(String qr) {
+    return new DcLot(checkQrCPtr(qr));
+  }
+
+  public native String getSecurejoinQr(int chat_id);
+
+  public native String getSecurejoinQrSvg(int chat_id);
+
+  public native String createQrSvg(String payload);
+
+  public native int joinSecurejoin(String qr);
+
+  public native void sendLocationsToChat(int chat_id, int seconds);
+
+  public native boolean isSendingLocationsToChat(int chat_id);
+
+  public DcProvider getProviderFromEmailWithDns(String email) {
+    long cptr = getProviderFromEmailWithDnsCPtr(email);
+    return cptr != 0 ? new DcProvider(cptr) : null;
+  }
+
+  public boolean isEnabled() {
+    return !"0".equals(getConfig(CONFIG_ACCOUNT_ENABLED));
+  }
+
+  public void setEnabled(boolean enabled) {
+    setConfigInt(CONFIG_ACCOUNT_ENABLED, enabled ? 1 : 0);
+    if (enabled) {
      startIo();
+    } else {
+      stopIo();
    }
+  }

-    /**
-     * @return true if at least one chat has location streaming enabled
-     */
-    public native boolean      setLocation          (float latitude, float longitude, float accuracy);
+  public boolean isMentionsEnabled() {
+    return getConfigInt(CONFIG_MUTE_MENTIONS_IF_MUTED) != 1;
+  }

-    // working with raw c-data
-    private long        contextCPtr;     // CAVE: the name is referenced in the JNI
-    private native long createContextCPtr(String osName, String dbfile);
-    private native void unrefContextCPtr ();
-    private native long getEventEmitterCPtr();
-    public  native long createMsgCPtr    (int viewtype);
-    private native long getChatlistCPtr  (int listflags, String query, int queryId);
-    private native long getChatCPtr      (int chat_id);
-    private native long getMsgCPtr       (int id);
-    private native long getDraftCPtr    (int id);
-    private native long getContactCPtr   (int id);
-    private native long checkQrCPtr      (String qr);
-    private native long getProviderFromEmailWithDnsCPtr  (String addr);
-    private native long newBackupProviderCPtr();
+  public void setMentionsEnabled(boolean enabled) {
+    setConfigInt(CONFIG_MUTE_MENTIONS_IF_MUTED, enabled ? 0 : 1);
+  }
+
+  public String getName() {
+    String displayname = getConfig("displayname");
+    if (displayname.isEmpty()) {
+      displayname = getConfig("addr");
+    }
+    return displayname;
+  }
+
+  public boolean isChatmail() {
+    return getConfigInt("is_chatmail") == 1;
+  }
+
+  public boolean isMuted() {
+    return getConfigInt("is_muted") == 1;
+  }
+
+  public void setMuted(boolean muted) {
+    setConfigInt("is_muted", muted ? 1 : 0);
+  }
+
+  public void restartIo() {
+    if (!isEnabled()) return;
+    stopIo();
+    startIo();
+  }
+
+  /**
+   * @return true if at least one chat has location streaming enabled
+   */
+  public native boolean setLocation(float latitude, float longitude, float accuracy);
+
+  // working with raw c-data
+  private long contextCPtr; // CAVE: the name is referenced in the JNI
+
+  private native long createContextCPtr(String osName, String dbfile);
+
+  private native void unrefContextCPtr();
+
+  private native long getEventEmitterCPtr();
+
+  public native long createMsgCPtr(int viewtype);
+
+  private native long getChatlistCPtr(int listflags, String query, int queryId);
+
+  private native long getChatCPtr(int chat_id);
+
+  private native long getMsgCPtr(int id);
+
+  private native long getDraftCPtr(int id);
+
+  private native long getContactCPtr(int id);
+
+  private native long checkQrCPtr(String qr);
+
+  private native long getProviderFromEmailWithDnsCPtr(String addr);
+
+  private native long newBackupProviderCPtr();
 }
@@ -2,24 +2,31 @@ package com.b44t.messenger;

 public class DcEvent {

-    public DcEvent(long eventCPtr) {
-        this.eventCPtr = eventCPtr;
-    }
+  public DcEvent(long eventCPtr) {
+    this.eventCPtr = eventCPtr;
+  }

-    @Override protected void finalize() throws Throwable {
-        super.finalize();
-        unrefEventCPtr();
-        eventCPtr = 0;
-    }
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+    unrefEventCPtr();
+    eventCPtr = 0;
+  }

-    public native int    getId       ();
-    public native int    getData1Int ();
-    public native int    getData2Int ();
-    public native String getData2Str ();
-    public native byte[] getData2Blob();
-    public native int    getAccountId();
+  public native int getId();

-    // working with raw c-data
-    private long        eventCPtr;    // CAVE: the name is referenced in the JNI
-    private native void unrefEventCPtr();
+  public native int getData1Int();
+
+  public native int getData2Int();
+
+  public native String getData2Str();
+
+  public native byte[] getData2Blob();
+
+  public native int getAccountId();
+
+  // working with raw c-data
+  private long eventCPtr; // CAVE: the name is referenced in the JNI
+
+  private native void unrefEventCPtr();
 }
@@ -0,0 +1,30 @@
+package com.b44t.messenger;
+
+public class DcEventChannel {
+
+  public DcEventChannel() {
+    eventChannelCPtr = createEventChannelCPtr();
+  }
+
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+    if (eventChannelCPtr != 0) {
+      unrefEventChannelCPtr();
+      eventChannelCPtr = 0;
+    }
+  }
+
+  public DcEventEmitter getEventEmitter() {
+    return new DcEventEmitter(getEventEmitterCPtr());
+  }
+
+  // working with raw c-data
+  private long eventChannelCPtr; // CAVE: the name is referenced in the JNI
+
+  private native long createEventChannelCPtr();
+
+  private native void unrefEventChannelCPtr();
+
+  private native long getEventEmitterCPtr();
+}
@@ -2,23 +2,26 @@ package com.b44t.messenger;

 public class DcEventEmitter {

-    public DcEventEmitter(long eventEmitterCPtr) {
-        this.eventEmitterCPtr = eventEmitterCPtr;
-    }
+  public DcEventEmitter(long eventEmitterCPtr) {
+    this.eventEmitterCPtr = eventEmitterCPtr;
+  }

-    @Override protected void finalize() throws Throwable {
-        super.finalize();
-        unrefEventEmitterCPtr();
-        eventEmitterCPtr = 0;
-    }
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+    unrefEventEmitterCPtr();
+    eventEmitterCPtr = 0;
+  }

-    public DcEvent getNextEvent () {
-        long eventCPtr = getNextEventCPtr();
-        return eventCPtr == 0 ? null : new DcEvent(eventCPtr);
-    }
+  public DcEvent getNextEvent() {
+    long eventCPtr = getNextEventCPtr();
+    return eventCPtr == 0 ? null : new DcEvent(eventCPtr);
+  }

-    // working with raw c-data
-    private long        eventEmitterCPtr;    // CAVE: the name is referenced in the JNI
-    private native long getNextEventCPtr     ();
-    private native void unrefEventEmitterCPtr();
+  // working with raw c-data
+  private long eventEmitterCPtr; // CAVE: the name is referenced in the JNI
+
+  private native long getNextEventCPtr();
+
+  private native void unrefEventEmitterCPtr();
 }
@@ -2,20 +2,23 @@ package com.b44t.messenger;

 public class DcJsonrpcInstance {

-    public DcJsonrpcInstance(long jsonrpcInstanceCPtr) {
-        this.jsonrpcInstanceCPtr = jsonrpcInstanceCPtr;
-    }
+  public DcJsonrpcInstance(long jsonrpcInstanceCPtr) {
+    this.jsonrpcInstanceCPtr = jsonrpcInstanceCPtr;
+  }

-    @Override protected void finalize() throws Throwable {
-        super.finalize();
-        unrefJsonrpcInstanceCPtr();
-        jsonrpcInstanceCPtr = 0;
-    }
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+    unrefJsonrpcInstanceCPtr();
+    jsonrpcInstanceCPtr = 0;
+  }

-    public native void request(String request);
-    public native String getNextResponse();
+  public native void request(String request);

-    // working with raw c-data
-    private long        jsonrpcInstanceCPtr;    // CAVE: the name is referenced in the JNI
-    private native void unrefJsonrpcInstanceCPtr();
+  public native String getNextResponse();
+
+  // working with raw c-data
+  private long jsonrpcInstanceCPtr; // CAVE: the name is referenced in the JNI
+
+  private native void unrefJsonrpcInstanceCPtr();
 }
@@ -2,28 +2,35 @@ package com.b44t.messenger;

 public class DcLot {

-    public final static int DC_TEXT1_DRAFT    = 1;
-    public final static int DC_TEXT1_USERNAME = 2;
-    public final static int DC_TEXT1_SELF     = 3;
+  public static final int DC_TEXT1_DRAFT = 1;
+  public static final int DC_TEXT1_USERNAME = 2;
+  public static final int DC_TEXT1_SELF = 3;

-    public DcLot(long lotCPtr) {
-        this.lotCPtr = lotCPtr;
-    }
+  public DcLot(long lotCPtr) {
+    this.lotCPtr = lotCPtr;
+  }

-    @Override protected void finalize() throws Throwable {
-        super.finalize();
-        unrefLotCPtr();
-        lotCPtr = 0;
-    }
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+    unrefLotCPtr();
+    lotCPtr = 0;
+  }

-    public native String getText1       ();
-    public native int    getText1Meaning();
-    public native String getText2       ();
-    public native long   getTimestamp   ();
-    public native int    getState       ();
-    public native int    getId          ();
+  public native String getText1();

-    // working with raw c-data
-    private long        lotCPtr;    // CAVE: the name is referenced in the JNI
-    private native void unrefLotCPtr();
+  public native int getText1Meaning();
+
+  public native String getText2();
+
+  public native long getTimestamp();
+
+  public native int getState();
+
+  public native int getId();
+
+  // working with raw c-data
+  private long lotCPtr; // CAVE: the name is referenced in the JNI
+
+  private native void unrefLotCPtr();
 }
@@ -1,14 +1,14 @@
 package com.b44t.messenger;

-/**
- * Contains a list of media entries, their respective positions and ability to move through it.
- */
+/** Contains a list of media entries, their respective positions and ability to move through it. */
 public class DcMediaGalleryElement {

  final int[] mediaMsgs;
  int position;
  final DcContext context;
-  public DcMediaGalleryElement(int[] mediaMsgs, int position, DcContext context, boolean leftIsRecent) {
+
+  public DcMediaGalleryElement(
+      int[] mediaMsgs, int position, DcContext context, boolean leftIsRecent) {
    this.mediaMsgs = mediaMsgs;
    this.position = position;
    this.context = context;
@@ -33,7 +33,7 @@ public class DcMediaGalleryElement {
  }

  public void moveToPosition(int newPosition) {
-    if(newPosition < 0 || newPosition >= mediaMsgs.length)
+    if (newPosition < 0 || newPosition >= mediaMsgs.length)
      throw new IllegalArgumentException("can't move outside of known area.");
    position = newPosition;
  }
@@ -1,266 +1,329 @@
 package com.b44t.messenger;

 import android.text.TextUtils;
-
-import org.json.JSONObject;
-
 import java.io.File;
 import java.util.Set;
+import org.json.JSONObject;

 public class DcMsg {

-    public final static int DC_MSG_UNDEFINED = 0;
-    public final static int DC_MSG_TEXT = 10;
-    public final static int DC_MSG_IMAGE = 20;
-    public final static int DC_MSG_GIF = 21;
-    public final static int DC_MSG_STICKER = 23;
-    public final static int DC_MSG_AUDIO = 40;
-    public final static int DC_MSG_VOICE = 41;
-    public final static int DC_MSG_VIDEO = 50;
-    public final static int DC_MSG_FILE = 60;
-    public final static int DC_MSG_CALL = 71;
-    public final static int DC_MSG_WEBXDC = 80;
-    public final static int DC_MSG_VCARD = 90;
+  public static final int DC_MSG_UNDEFINED = 0;
+  public static final int DC_MSG_TEXT = 10;
+  public static final int DC_MSG_IMAGE = 20;
+  public static final int DC_MSG_GIF = 21;
+  public static final int DC_MSG_STICKER = 23;
+  public static final int DC_MSG_AUDIO = 40;
+  public static final int DC_MSG_VOICE = 41;
+  public static final int DC_MSG_VIDEO = 50;
+  public static final int DC_MSG_FILE = 60;
+  public static final int DC_MSG_CALL = 71;
+  public static final int DC_MSG_WEBXDC = 80;
+  public static final int DC_MSG_VCARD = 90;

-    public final static int DC_INFO_UNKNOWN                   = 0;
-    public final static int DC_INFO_GROUP_NAME_CHANGED        = 2;
-    public final static int DC_INFO_GROUP_IMAGE_CHANGED       = 3;
-    public final static int DC_INFO_MEMBER_ADDED_TO_GROUP     = 4;
-    public final static int DC_INFO_MEMBER_REMOVED_FROM_GROUP = 5;
-    public final static int DC_INFO_AUTOCRYPT_SETUP_MESSAGE   = 6;
-    public final static int DC_INFO_SECURE_JOIN_MESSAGE       = 7;
-    public final static int DC_INFO_LOCATIONSTREAMING_ENABLED = 8;
-    public final static int DC_INFO_LOCATION_ONLY             = 9;
-    public final static int DC_INFO_EPHEMERAL_TIMER_CHANGED   = 10;
-    public final static int DC_INFO_PROTECTION_ENABLED        = 11;
-    public final static int DC_INFO_INVALID_UNENCRYPTED_MAIL  = 13;
-    public final static int DC_INFO_WEBXDC_INFO_MESSAGE       = 32;
-    public final static int DC_INFO_CHAT_E2EE                 = 50;
+  public static final int DC_INFO_UNKNOWN = 0;
+  public static final int DC_INFO_GROUP_NAME_CHANGED = 2;
+  public static final int DC_INFO_GROUP_IMAGE_CHANGED = 3;
+  public static final int DC_INFO_MEMBER_ADDED_TO_GROUP = 4;
+  public static final int DC_INFO_MEMBER_REMOVED_FROM_GROUP = 5;
+  public static final int DC_INFO_SECURE_JOIN_MESSAGE = 7;
+  public static final int DC_INFO_LOCATIONSTREAMING_ENABLED = 8;
+  public static final int DC_INFO_LOCATION_ONLY = 9;
+  public static final int DC_INFO_EPHEMERAL_TIMER_CHANGED = 10;
+  public static final int DC_INFO_PROTECTION_ENABLED = 11;
+  public static final int DC_INFO_INVALID_UNENCRYPTED_MAIL = 13;
+  public static final int DC_INFO_WEBXDC_INFO_MESSAGE = 32;
+  public static final int DC_INFO_CHAT_E2EE = 50;
+  public static final int DC_INFO_CHAT_DESCRIPTION_CHANGED = 70;

-    public final static int DC_STATE_UNDEFINED =  0;
-    public final static int DC_STATE_IN_FRESH = 10;
-    public final static int DC_STATE_IN_NOTICED = 13;
-    public final static int DC_STATE_IN_SEEN = 16;
-    public final static int DC_STATE_OUT_PREPARING = 18;
-    public final static int DC_STATE_OUT_DRAFT = 19;
-    public final static int DC_STATE_OUT_PENDING = 20;
-    public final static int DC_STATE_OUT_FAILED = 24;
-    public final static int DC_STATE_OUT_DELIVERED = 26;
-    public final static int DC_STATE_OUT_MDN_RCVD = 28;
+  public static final int DC_STATE_UNDEFINED = 0;
+  public static final int DC_STATE_IN_FRESH = 10;
+  public static final int DC_STATE_IN_NOTICED = 13;
+  public static final int DC_STATE_IN_SEEN = 16;
+  public static final int DC_STATE_OUT_PREPARING = 18;
+  public static final int DC_STATE_OUT_DRAFT = 19;
+  public static final int DC_STATE_OUT_PENDING = 20;
+  public static final int DC_STATE_OUT_FAILED = 24;
+  public static final int DC_STATE_OUT_DELIVERED = 26;
+  public static final int DC_STATE_OUT_MDN_RCVD = 28;

-    public final static int DC_DOWNLOAD_DONE = 0;
-    public final static int DC_DOWNLOAD_AVAILABLE = 10;
-    public final static int DC_DOWNLOAD_FAILURE = 20;
-    public final static int DC_DOWNLOAD_UNDECIPHERABLE = 30;
-    public final static int DC_DOWNLOAD_IN_PROGRESS = 1000;
+  public static final int DC_DOWNLOAD_DONE = 0;
+  public static final int DC_DOWNLOAD_AVAILABLE = 10;
+  public static final int DC_DOWNLOAD_FAILURE = 20;
+  public static final int DC_DOWNLOAD_UNDECIPHERABLE = 30;
+  public static final int DC_DOWNLOAD_IN_PROGRESS = 1000;

-    public static final int DC_MSG_NO_ID = 0;
-    public final static int DC_MSG_ID_MARKER1 = 1;
-    public final static int DC_MSG_ID_DAYMARKER = 9;
+  public static final int DC_MSG_NO_ID = 0;
+  public static final int DC_MSG_ID_MARKER1 = 1;
+  public static final int DC_MSG_ID_DAYMARKER = 9;

-    public final static int DC_VIDEOCHATTYPE_UNKNOWN = 0;
-    public final static int DC_VIDEOCHATTYPE_BASICWEBRTC = 1;
+  public static final int DC_VIDEOCHATTYPE_UNKNOWN = 0;
+  public static final int DC_VIDEOCHATTYPE_BASICWEBRTC = 1;

-    private static final String TAG = DcMsg.class.getSimpleName();
+  private static final String TAG = DcMsg.class.getSimpleName();

-    public DcMsg(DcContext context, int viewtype) {
-        msgCPtr = context.createMsgCPtr(viewtype);
+  public DcMsg(DcContext context, int viewtype) {
+    msgCPtr = context.createMsgCPtr(viewtype);
+  }
+
+  public DcMsg(long msgCPtr) {
+    this.msgCPtr = msgCPtr;
+  }
+
+  public boolean isOk() {
+    return msgCPtr != 0;
+  }
+
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+    unrefMsgCPtr();
+    msgCPtr = 0;
+  }
+
+  @Override
+  public int hashCode() {
+    return this.getId();
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    if (other == null || !(other instanceof DcMsg)) {
+      return false;
    }

-    public DcMsg(long msgCPtr) {
-        this.msgCPtr = msgCPtr;
-    }
+    DcMsg that = (DcMsg) other;
+    return this.getId() == that.getId() && this.getId() != 0;
+  }

-    public boolean isOk() {
-      return msgCPtr != 0;
-    }
-
-    @Override
-    protected void finalize() throws Throwable {
-        super.finalize();
-        unrefMsgCPtr();
-        msgCPtr = 0;
-    }
-
-    @Override
-    public int hashCode() {
-        return this.getId();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == null || !(other instanceof DcMsg)) {
-            return false;
-        }
-
-        DcMsg that = (DcMsg) other;
-        return this.getId()==that.getId() && this.getId()!=0;
-    }
-
-    /**
-     * If given a message, calculates the position of the message in the chat
-     */
-    public static int getMessagePosition(DcMsg msg, DcContext dcContext) {
-        int msgs[] = dcContext.getChatMsgs(msg.getChatId(), 0, 0);
-        int startingPosition = -1;
-        int msgId = msg.getId();
-        for (int i = 0; i < msgs.length; i++) {
-            if (msgs[i] == msgId) {
-                startingPosition = msgs.length - 1 - i;
-                break;
-            }
-        }
-        return startingPosition;
-    }
-
-    public native int     getId              ();
-    public native String  getText            ();
-    public native String  getSubject         ();
-    public native long    getTimestamp       ();
-    public native long    getSortTimestamp   ();
-    public native boolean hasDeviatingTimestamp();
-    public native boolean hasLocation        ();
-    private native int    getViewType        ();
-    public int            getType            () { return getDownloadState()==DC_DOWNLOAD_DONE? getViewType() : DC_MSG_TEXT; }
-    public native int     getInfoType        ();
-    public native int     getInfoContactId   ();
-    public native int     getState           ();
-    public native int     getDownloadState   ();
-    public native int     getChatId          ();
-    public native int     getFromId          ();
-    public native int     getWidth           (int def);
-    public native int     getHeight          (int def);
-    public native int     getDuration        ();
-    public native void    lateFilingMediaSize(int width, int height, int duration);
-    public DcLot          getSummary         (DcChat chat) { return new DcLot(getSummaryCPtr(chat.getChatCPtr())); }
-    public native String  getSummarytext     (int approx_characters);
-    public native int     showPadlock        ();
-    public boolean        hasFile            () { String file = getFile(); return file!=null && !file.isEmpty(); }
-    public native String  getFile            ();
-    public native String  getFilemime        ();
-    public native String  getFilename        ();
-    public native long    getFilebytes       ();
-    public native byte[]  getWebxdcBlob      (String filename);
-    public JSONObject     getWebxdcInfo      () {
-      try {
-        String json = getWebxdcInfoJson();
-        if (json != null && !json.isEmpty()) return new JSONObject(json);
-      } catch(Exception e) {
-        e.printStackTrace();
+  /** If given a message, calculates the position of the message in the chat */
+  public static int getMessagePosition(DcMsg msg, DcContext dcContext) {
+    int msgs[] = dcContext.getChatMsgs(msg.getChatId(), 0, 0);
+    int startingPosition = -1;
+    int msgId = msg.getId();
+    for (int i = 0; i < msgs.length; i++) {
+      if (msgs[i] == msgId) {
+        startingPosition = msgs.length - 1 - i;
+        break;
      }
-      return new JSONObject();
    }
-    public native String  getWebxdcHref      ();
-    public native boolean isForwarded        ();
-    public native boolean isInfo             ();
-    public native boolean hasHtml            ();
-    public native String  getSetupCodeBegin  ();
-    public native void    setText            (String text);
-    public native void    setSubject         (String text);
-    public native void    setHtml            (String text);
-    public native void    forceSticker       ();
-    public native void    setFileAndDeduplicate(String file, String name, String filemime);
-    public native void    setDimension       (int width, int height);
-    public native void    setDuration        (int duration);
-    public native void    setLocation        (float latitude, float longitude);
-    public native String  getPOILocation     ();
-    public void           setQuote           (DcMsg quote) { setQuoteCPtr(quote.msgCPtr); }
-    public native String  getQuotedText      ();
-    public native String  getError           ();
-    public native String  getOverrideSenderName();
-    public native boolean isEdited           ();
+    return startingPosition;
+  }

-    public String getSenderName(DcContact dcContact) {
-        String overrideName = getOverrideSenderName();
-        if (overrideName != null) {
-            return "~" + overrideName;
-        } else {
-            return dcContact.getDisplayName();
-        }
-    }
+  public native int getId();

-    public DcMsg          getQuotedMsg       () {
-        long cPtr = getQuotedMsgCPtr();
-        return cPtr != 0 ? new DcMsg(cPtr) : null;
-    }
+  public native String getText();

-    public DcMsg getParent() {
-      long cPtr = getParentCPtr();
-      return cPtr != 0 ? new DcMsg(cPtr) : null;
-    }
+  public native String getSubject();

-    public native int getOriginalMsgId  ();
-    public native int getSavedMsgId     ();
+  public native long getTimestamp();

-    public boolean canSave() {
-      // saving info-messages out of context results in confusion, see https://github.com/deltachat/deltachat-ios/issues/2567
-      return !isInfo();
-    }
+  public native long getSortTimestamp();

-    public File getFileAsFile() {
-        if(getFile()==null)
-            throw new AssertionError("expected a file to be present.");
-        return new File(getFile());
-    }
+  public native boolean hasDeviatingTimestamp();

-    // aliases and higher-level tools
-    public static int[] msgSetToIds(final Set<DcMsg> dcMsgs) {
-        if (dcMsgs == null) {
-            return new int[0];
-        }
-        int[] ids = new int[dcMsgs.size()];
-        int   i = 0;
-        for (DcMsg dcMsg : dcMsgs) {
-            ids[i++] = dcMsg.getId();
-        }
-        return ids;
-    }
+  public native boolean hasLocation();

-    public boolean isOutgoing() {
-        return getFromId() == DcContact.DC_CONTACT_ID_SELF;
-    }
+  private native int getViewType();

-    public String getDisplayBody()  {
-        return getText();
-    }
+  public int getType() {
+    return getDownloadState() == DC_DOWNLOAD_DONE ? getViewType() : DC_MSG_TEXT;
+  }

-    public String getBody()  {
-        return getText();
-    }
+  public native int getInfoType();

-    public long getDateReceived() {
-        return getTimestamp();
-    }
+  public native int getInfoContactId();

-    public boolean isFailed() {
-        return (getState() == DC_STATE_OUT_FAILED) || (!TextUtils.isEmpty(getError()));
-    }
-    public boolean isPreparing() {
-        return getState() == DC_STATE_OUT_PREPARING;
-    }
-    public boolean isSecure() {
-        return showPadlock()!=0;
-    }
-    public boolean isPending() {
-        return getState() == DC_STATE_OUT_PENDING;
-    }
-    public boolean isDelivered() {
-        return getState() == DC_STATE_OUT_DELIVERED;
-    }
-    public boolean isRemoteRead() {
-        return getState() == DC_STATE_OUT_MDN_RCVD;
-    }
-    public boolean isSeen() {
-        return getState() == DC_STATE_IN_SEEN;
-    }
+  public native int getState();

+  public native int getDownloadState();

-    // working with raw c-data
-    private long        msgCPtr;        // CAVE: the name is referenced in the JNI
-    private native void unrefMsgCPtr    ();
-    private native long getSummaryCPtr  (long chatCPtr);
-    private native void setQuoteCPtr    (long quoteCPtr);
-    private native long getQuotedMsgCPtr ();
-    private native long getParentCPtr   ();
-    private native String getWebxdcInfoJson ();
-};
+  public native int getChatId();
+
+  public native int getFromId();
+
+  public native int getWidth(int def);
+
+  public native int getHeight(int def);
+
+  public native int getDuration();
+
+  public native void lateFilingMediaSize(int width, int height, int duration);
+
+  public DcLot getSummary(DcChat chat) {
+    return new DcLot(getSummaryCPtr(chat.getChatCPtr()));
+  }
+
+  public native String getSummarytext(int approx_characters);
+
+  public native int showPadlock();
+
+  public boolean hasFile() {
+    String file = getFile();
+    return file != null && !file.isEmpty();
+  }
+
+  public native String getFile();
+
+  public native String getFilemime();
+
+  public native String getFilename();
+
+  public native long getFilebytes();
+
+  public native byte[] getWebxdcBlob(String filename);
+
+  public JSONObject getWebxdcInfo() {
+    try {
+      String json = getWebxdcInfoJson();
+      if (json != null && !json.isEmpty()) return new JSONObject(json);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return new JSONObject();
+  }
+
+  public native String getWebxdcHref();
+
+  public native boolean isForwarded();
+
+  public native boolean isInfo();
+
+  public native boolean hasHtml();
+
+  public native void setText(String text);
+
+  public native void setSubject(String text);
+
+  public native void setHtml(String text);
+
+  public native void forceSticker();
+
+  public native void setFileAndDeduplicate(String file, String name, String filemime);
+
+  public native void setDimension(int width, int height);
+
+  public native void setDuration(int duration);
+
+  public native void setLocation(float latitude, float longitude);
+
+  public native String getPOILocation();
+
+  public void setQuote(DcMsg quote) {
+    setQuoteCPtr(quote.msgCPtr);
+  }
+
+  public native String getQuotedText();
+
+  public native String getError();
+
+  public native String getOverrideSenderName();
+
+  public native boolean isEdited();
+
+  public String getSenderName(DcContact dcContact) {
+    String overrideName = getOverrideSenderName();
+    if (overrideName != null) {
+      return "~" + overrideName;
+    } else {
+      return dcContact.getDisplayName();
+    }
+  }
+
+  public DcMsg getQuotedMsg() {
+    long cPtr = getQuotedMsgCPtr();
+    return cPtr != 0 ? new DcMsg(cPtr) : null;
+  }
+
+  public DcMsg getParent() {
+    long cPtr = getParentCPtr();
+    return cPtr != 0 ? new DcMsg(cPtr) : null;
+  }
+
+  public native int getOriginalMsgId();
+
+  public native int getSavedMsgId();
+
+  public boolean canSave() {
+    // saving info-messages out of context results in confusion, see
+    // https://github.com/deltachat/deltachat-ios/issues/2567
+    return !isInfo();
+  }
+
+  public File getFileAsFile() {
+    if (getFile() == null) throw new AssertionError("expected a file to be present.");
+    return new File(getFile());
+  }
+
+  // aliases and higher-level tools
+  public static int[] msgSetToIds(final Set<DcMsg> dcMsgs) {
+    if (dcMsgs == null) {
+      return new int[0];
+    }
+    int[] ids = new int[dcMsgs.size()];
+    int i = 0;
+    for (DcMsg dcMsg : dcMsgs) {
+      ids[i++] = dcMsg.getId();
+    }
+    return ids;
+  }
+
+  public boolean isOutgoing() {
+    return getFromId() == DcContact.DC_CONTACT_ID_SELF;
+  }
+
+  public String getDisplayBody() {
+    return getText();
+  }
+
+  public String getBody() {
+    return getText();
+  }
+
+  public long getDateReceived() {
+    return getTimestamp();
+  }
+
+  public boolean isFailed() {
+    return (getState() == DC_STATE_OUT_FAILED) || (!TextUtils.isEmpty(getError()));
+  }
+
+  public boolean isPreparing() {
+    return getState() == DC_STATE_OUT_PREPARING;
+  }
+
+  public boolean isSecure() {
+    return showPadlock() != 0;
+  }
+
+  public boolean isPending() {
+    return getState() == DC_STATE_OUT_PENDING;
+  }
+
+  public boolean isDelivered() {
+    return getState() == DC_STATE_OUT_DELIVERED;
+  }
+
+  public boolean isRemoteRead() {
+    return getState() == DC_STATE_OUT_MDN_RCVD;
+  }
+
+  public boolean isSeen() {
+    return getState() == DC_STATE_IN_SEEN;
+  }
+
+  // working with raw c-data
+  private long msgCPtr; // CAVE: the name is referenced in the JNI
+
+  private native void unrefMsgCPtr();
+
+  private native long getSummaryCPtr(long chatCPtr);
+
+  private native void setQuoteCPtr(long quoteCPtr);
+
+  private native long getQuotedMsgCPtr();
+
+  private native long getParentCPtr();
+
+  private native String getWebxdcInfoJson();
+}
+;
@@ -2,25 +2,29 @@ package com.b44t.messenger;

 public class DcProvider {

-    public final static int DC_PROVIDER_STATUS_OK          = 1;
-    public final static int DC_PROVIDER_STATUS_PREPARATION = 2;
-    public final static int DC_PROVIDER_STATUS_BROKEN      = 3;
+  public static final int DC_PROVIDER_STATUS_OK = 1;
+  public static final int DC_PROVIDER_STATUS_PREPARATION = 2;
+  public static final int DC_PROVIDER_STATUS_BROKEN = 3;

-    public DcProvider(long providerCPtr) {
-        this.providerCPtr = providerCPtr;
-    }
+  public DcProvider(long providerCPtr) {
+    this.providerCPtr = providerCPtr;
+  }

-    @Override protected void finalize() throws Throwable {
-        super.finalize();
-        unrefProviderCPtr();
-        providerCPtr = 0;
-    }
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+    unrefProviderCPtr();
+    providerCPtr = 0;
+  }

-    public native int       getStatus          ();
-    public native String    getBeforeLoginHint ();
-    public native String    getOverviewPage    ();
+  public native int getStatus();

-    // working with raw c-data
-    private long        providerCPtr;    // CAVE: the name is referenced in the JNI
-    private native void unrefProviderCPtr();
+  public native String getBeforeLoginHint();
+
+  public native String getOverviewPage();
+
+  // working with raw c-data
+  private long providerCPtr; // CAVE: the name is referenced in the JNI
+
+  private native void unrefProviderCPtr();
 }
@@ -1,9 +1,9 @@
 package com.b44t.messenger;

-import chat.delta.rpc.BaseTransport;
+import chat.delta.rpc.BaseRpcTransport;

 /* RPC transport over C FFI */
-public class FFITransport extends BaseTransport {
+public class FFITransport extends BaseRpcTransport {
  private final DcJsonrpcInstance dcJsonrpcInstance;

  public FFITransport(DcJsonrpcInstance dcJsonrpcInstance) {
@@ -19,4 +19,4 @@ public class FFITransport extends BaseTransport {
  protected String getResponse() {
    return dcJsonrpcInstance.getNextResponse();
  }
-}
+}
@@ -1,61 +1,73 @@
 package org.thoughtcrime.securesms;

+import android.content.ComponentName;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.MenuItem;
 import android.view.ViewGroup;
-
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.media3.session.MediaController;
+import androidx.media3.session.SessionCommand;
+import androidx.media3.session.SessionToken;
 import androidx.viewpager.widget.ViewPager;
-
 import com.b44t.messenger.DcChat;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEvent;
 import com.b44t.messenger.DcMsg;
 import com.google.android.material.tabs.TabLayout;
-
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.ArrayList;
+import org.thoughtcrime.securesms.components.audioplay.AudioPlaybackViewModel;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
+import org.thoughtcrime.securesms.service.AudioPlaybackService;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
-import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;

-import java.util.ArrayList;
-
 public class AllMediaActivity extends PassphraseRequiredActionBarActivity
-                             implements DcEventCenter.DcEventDelegate
-{
+    implements DcEventCenter.DcEventDelegate {
+  private static final String TAG = AllMediaActivity.class.getSimpleName();

-  public static final String CHAT_ID_EXTRA    = "chat_id";
+  public static final String CHAT_ID_EXTRA = "chat_id";
  public static final String CONTACT_ID_EXTRA = "contact_id";
-  public static final String FORCE_GALLERY    = "force_gallery";
+  public static final String FORCE_GALLERY = "force_gallery";

  static class TabData {
    final int title;
    final int type1;
    final int type2;
    final int type3;
+
    TabData(int title, int type1, int type2, int type3) {
      this.title = title;
      this.type1 = type1;
      this.type2 = type2;
      this.type3 = type3;
    }
-  };
+  }
+  ;

-  private DcContext            dcContext;
-  private int                  chatId;
-  private int                  contactId;
+  private DcContext dcContext;
+  private int chatId;
+  private int contactId;

  private final ArrayList<TabData> tabs = new ArrayList<>();
-  private Toolbar            toolbar;
-  private TabLayout          tabLayout;
-  private ViewPager          viewPager;
+  private Toolbar toolbar;
+  private TabLayout tabLayout;
+  private ViewPager viewPager;
+
+  private @Nullable MediaController mediaController;
+  private ListenableFuture<MediaController> mediaControllerFuture;
+  private AudioPlaybackViewModel playbackViewModel;

  @Override
  protected void onPreCreate() {
@@ -67,7 +79,9 @@ public class AllMediaActivity extends PassphraseRequiredActionBarActivity
  @Override
  protected void onCreate(Bundle bundle, boolean ready) {
    tabs.add(new TabData(R.string.webxdc_apps, DcMsg.DC_MSG_WEBXDC, 0, 0));
-    tabs.add(new TabData(R.string.tab_gallery, DcMsg.DC_MSG_IMAGE, DcMsg.DC_MSG_GIF, DcMsg.DC_MSG_VIDEO));
+    tabs.add(
+        new TabData(
+            R.string.tab_gallery, DcMsg.DC_MSG_IMAGE, DcMsg.DC_MSG_GIF, DcMsg.DC_MSG_VIDEO));
    tabs.add(new TabData(R.string.audio, DcMsg.DC_MSG_AUDIO, DcMsg.DC_MSG_VOICE, 0));
    tabs.add(new TabData(R.string.files, DcMsg.DC_MSG_FILE, 0, 0));

@@ -79,7 +93,8 @@ public class AllMediaActivity extends PassphraseRequiredActionBarActivity
    ActionBar supportActionBar = getSupportActionBar();
    if (supportActionBar != null) {
      supportActionBar.setDisplayHomeAsUpEnabled(true);
-      supportActionBar.setTitle(isGlobalGallery() ? R.string.menu_all_media : R.string.apps_and_media);
+      supportActionBar.setTitle(
+          isGlobalGallery() ? R.string.menu_all_media : R.string.apps_and_media);
    }

    this.tabLayout.setupWithViewPager(viewPager);
@@ -91,41 +106,80 @@ public class AllMediaActivity extends PassphraseRequiredActionBarActivity
    DcEventCenter eventCenter = DcHelper.getEventCenter(this);
    eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this);
    eventCenter.addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this);
+
+    playbackViewModel = new ViewModelProvider(this).get(AudioPlaybackViewModel.class);
+    initializeMediaController();
  }

  @Override
  public void onDestroy() {
    DcHelper.getEventCenter(this).removeObservers(this);
+    if (mediaController != null) {
+      MediaController.releaseFuture(mediaControllerFuture);
+      mediaController = null;
+      playbackViewModel.setMediaController(null);
+    }
    super.onDestroy();
  }

  @Override
-  public void handleEvent(@NonNull DcEvent event) {
-  }
+  public void handleEvent(@NonNull DcEvent event) {}

  private void initializeResources() {
-    chatId           = getIntent().getIntExtra(CHAT_ID_EXTRA, 0);
-    contactId        = getIntent().getIntExtra(CONTACT_ID_EXTRA, 0);
+    chatId = getIntent().getIntExtra(CHAT_ID_EXTRA, 0);
+    contactId = getIntent().getIntExtra(CONTACT_ID_EXTRA, 0);

-    if (contactId!=0) {
+    if (contactId != 0) {
      chatId = dcContext.getChatIdByContactId(contactId);
    }

-    if(chatId!=0) {
+    if (chatId != 0) {
      DcChat dcChat = dcContext.getChat(chatId);
-      if(!dcChat.isMultiUser()) {
+      if (!dcChat.isMultiUser()) {
        final int[] members = dcContext.getChatContacts(chatId);
-        contactId = members.length>=1? members[0] : 0;
+        contactId = members.length >= 1 ? members[0] : 0;
      }
    }

    this.viewPager = ViewUtil.findById(this, R.id.pager);
-    this.toolbar   = ViewUtil.findById(this, R.id.toolbar);
+    this.toolbar = ViewUtil.findById(this, R.id.toolbar);
    this.tabLayout = ViewUtil.findById(this, R.id.tab_layout);
  }

+  private void initializeMediaController() {
+    SessionToken sessionToken =
+        new SessionToken(this, new ComponentName(this, AudioPlaybackService.class));
+    mediaControllerFuture = new MediaController.Builder(this, sessionToken).buildAsync();
+    mediaControllerFuture.addListener(
+        () -> {
+          try {
+            mediaController = mediaControllerFuture.get();
+            addActivityContext(this.getIntent().getExtras(), this.getClass().getName());
+            playbackViewModel.setMediaController(mediaController);
+          } catch (Exception e) {
+            Log.e(TAG, "Error connecting to audio playback service", e);
+          }
+        },
+        ContextCompat.getMainExecutor(this));
+  }
+
+  private void addActivityContext(Bundle extras, String activityClassName) {
+    if (mediaController == null) return;
+
+    Bundle commandArgs = new Bundle();
+    commandArgs.putString("activity_class", activityClassName);
+    if (extras != null) {
+      commandArgs.putAll(extras);
+    }
+
+    SessionCommand updateContextCommand =
+        new SessionCommand("UPDATE_ACTIVITY_CONTEXT", Bundle.EMPTY);
+
+    mediaController.sendCustomCommand(updateContextCommand, commandArgs);
+  }
+
  private boolean isGlobalGallery() {
-    return contactId==0 && chatId==0;
+    return contactId == 0 && chatId == 0;
  }

  private class AllMediaPagerAdapter extends FragmentStatePagerAdapter {
@@ -159,10 +213,14 @@ public class AllMediaActivity extends PassphraseRequiredActionBarActivity

      if (data.type1 == DcMsg.DC_MSG_IMAGE) {
        fragment = new AllMediaGalleryFragment();
-        args.putInt(AllMediaGalleryFragment.CHAT_ID_EXTRA, (chatId==0&&!isGlobalGallery())? -1 : chatId);
+        args.putInt(
+            AllMediaGalleryFragment.CHAT_ID_EXTRA,
+            (chatId == 0 && !isGlobalGallery()) ? -1 : chatId);
      } else {
        fragment = new AllMediaDocumentsFragment();
-        args.putInt(AllMediaDocumentsFragment.CHAT_ID_EXTRA, (chatId==0&&!isGlobalGallery())? -1 : chatId);
+        args.putInt(
+            AllMediaDocumentsFragment.CHAT_ID_EXTRA,
+            (chatId == 0 && !isGlobalGallery()) ? -1 : chatId);
        args.putInt(AllMediaDocumentsFragment.VIEWTYPE1, data.type1);
        args.putInt(AllMediaDocumentsFragment.VIEWTYPE2, data.type2);
      }
@@ -5,15 +5,16 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-
 import androidx.annotation.NonNull;
-
 import com.b44t.messenger.DcMsg;
 import com.codewaves.stickyheadergrid.StickyHeaderGridAdapter;
-
-import org.thoughtcrime.securesms.components.AudioView;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import org.thoughtcrime.securesms.components.DocumentView;
 import org.thoughtcrime.securesms.components.WebxdcView;
+import org.thoughtcrime.securesms.components.audioplay.AudioPlaybackViewModel;
+import org.thoughtcrime.securesms.components.audioplay.AudioView;
 import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader.BucketedThreadMedia;
 import org.thoughtcrime.securesms.mms.AudioSlide;
 import org.thoughtcrime.securesms.mms.DocumentSlide;
@@ -21,30 +22,27 @@ import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.MediaUtil;

-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
 class AllMediaDocumentsAdapter extends StickyHeaderGridAdapter {

-  private final Context             context;
-  private final ItemClickListener   itemClickListener;
-  private final Set<DcMsg>          selected;
+  private final Context context;
+  private final ItemClickListener itemClickListener;
+  private final Set<DcMsg> selected;

-  private  BucketedThreadMedia media;
+  private BucketedThreadMedia media;
+  private AudioPlaybackViewModel playbackViewModel;

  private static class ViewHolder extends StickyHeaderGridAdapter.ItemViewHolder {
    private final DocumentView documentView;
-    private final AudioView    audioView;
-    private final WebxdcView   webxdcView;
-    private final TextView     date;
+    private final AudioView audioView;
+    private final WebxdcView webxdcView;
+    private final TextView date;

    public ViewHolder(View v) {
      super(v);
-      documentView      = v.findViewById(R.id.document_view);
-      audioView         = v.findViewById(R.id.audio_view);
-      webxdcView        = v.findViewById(R.id.webxdc_view);
-      date              = v.findViewById(R.id.date);
+      documentView = v.findViewById(R.id.document_view);
+      audioView = v.findViewById(R.id.audio_view);
+      webxdcView = v.findViewById(R.id.webxdc_view);
+      date = v.findViewById(R.id.date);
    }
  }

@@ -57,86 +55,108 @@ class AllMediaDocumentsAdapter extends StickyHeaderGridAdapter {
    }
  }

-  AllMediaDocumentsAdapter(@NonNull Context context,
-                           BucketedThreadMedia media,
-                           ItemClickListener clickListener)
-  {
-    this.context           = context;
-    this.media             = media;
+  AllMediaDocumentsAdapter(
+      @NonNull Context context, BucketedThreadMedia media, ItemClickListener clickListener) {
+    this.context = context;
+    this.media = media;
    this.itemClickListener = clickListener;
-    this.selected          = new HashSet<>();
+    this.selected = new HashSet<>();
  }

  public void setMedia(BucketedThreadMedia media) {
    this.media = media;
  }

+  public void setPlaybackViewModel(AudioPlaybackViewModel playbackViewModel) {
+    this.playbackViewModel = playbackViewModel;
+  }
+
  @Override
-  public StickyHeaderGridAdapter.HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent, int headerType) {
-    return new HeaderHolder(LayoutInflater.from(context).inflate(R.layout.contact_selection_list_divider, parent, false));
+  public StickyHeaderGridAdapter.HeaderViewHolder onCreateHeaderViewHolder(
+      ViewGroup parent, int headerType) {
+    return new HeaderHolder(
+        LayoutInflater.from(context)
+            .inflate(R.layout.contact_selection_list_divider, parent, false));
  }

  @Override
  public ItemViewHolder onCreateItemViewHolder(ViewGroup parent, int itemType) {
-    return new ViewHolder(LayoutInflater.from(context).inflate(R.layout.profile_document_item, parent, false));
+    return new ViewHolder(
+        LayoutInflater.from(context).inflate(R.layout.profile_document_item, parent, false));
  }

  @Override
-  public void onBindHeaderViewHolder(StickyHeaderGridAdapter.HeaderViewHolder viewHolder, int section) {
-    ((HeaderHolder)viewHolder).textView.setText(media.getName(section));
+  public void onBindHeaderViewHolder(
+      StickyHeaderGridAdapter.HeaderViewHolder viewHolder, int section) {
+    ((HeaderHolder) viewHolder).textView.setText(media.getName(section));
  }

  @Override
  public void onBindItemViewHolder(ItemViewHolder itemViewHolder, int section, int offset) {
-    ViewHolder    viewHolder        = ((ViewHolder)itemViewHolder);
-    DcMsg         dcMsg             = media.get(section, offset);
-    Slide         slide             = MediaUtil.getSlideForMsg(context, dcMsg);
+    ViewHolder viewHolder = ((ViewHolder) itemViewHolder);
+    DcMsg dcMsg = media.get(section, offset);
+    Slide slide = MediaUtil.getSlideForMsg(context, dcMsg);

    if (slide != null && slide.hasAudio()) {
      viewHolder.documentView.setVisibility(View.GONE);
      viewHolder.webxdcView.setVisibility(View.GONE);

      viewHolder.audioView.setVisibility(View.VISIBLE);
-      viewHolder.audioView.setAudio((AudioSlide)slide, dcMsg.getDuration());
+      viewHolder.audioView.setPlaybackViewModel(playbackViewModel);
+      viewHolder.audioView.setAudio((AudioSlide) slide);
      viewHolder.audioView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg));
-      viewHolder.audioView.setOnLongClickListener(view -> { itemClickListener.onMediaLongClicked(dcMsg); return true; });
+      viewHolder.audioView.setOnLongClickListener(
+          view -> {
+            itemClickListener.onMediaLongClicked(dcMsg);
+            return true;
+          });
      viewHolder.audioView.disablePlayer(!selected.isEmpty());
      viewHolder.itemView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg));
      viewHolder.date.setVisibility(View.VISIBLE);
-    }
-    else if (slide != null && slide.isWebxdcDocument()) {
+    } else if (slide != null && slide.isWebxdcDocument()) {
      viewHolder.audioView.setVisibility(View.GONE);
      viewHolder.documentView.setVisibility(View.GONE);

      viewHolder.webxdcView.setVisibility(View.VISIBLE);
      viewHolder.webxdcView.setWebxdc(dcMsg, "");
      viewHolder.webxdcView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg));
-      viewHolder.webxdcView.setOnLongClickListener(view -> { itemClickListener.onMediaLongClicked(dcMsg); return true; });
+      viewHolder.webxdcView.setOnLongClickListener(
+          view -> {
+            itemClickListener.onMediaLongClicked(dcMsg);
+            return true;
+          });
      viewHolder.itemView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg));
      viewHolder.date.setVisibility(View.GONE);
-    }
-    else if (slide != null && slide.hasDocument()) {
+    } else if (slide != null && slide.hasDocument()) {
      viewHolder.audioView.setVisibility(View.GONE);
      viewHolder.webxdcView.setVisibility(View.GONE);

      viewHolder.documentView.setVisibility(View.VISIBLE);
-      viewHolder.documentView.setDocument((DocumentSlide)slide);
+      viewHolder.documentView.setDocument((DocumentSlide) slide);
      viewHolder.documentView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg));
-      viewHolder.documentView.setOnLongClickListener(view -> { itemClickListener.onMediaLongClicked(dcMsg); return true; });
+      viewHolder.documentView.setOnLongClickListener(
+          view -> {
+            itemClickListener.onMediaLongClicked(dcMsg);
+            return true;
+          });
      viewHolder.itemView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg));
      viewHolder.date.setVisibility(View.VISIBLE);
-    }
-    else {
+    } else {
      viewHolder.documentView.setVisibility(View.GONE);
      viewHolder.audioView.setVisibility(View.GONE);
      viewHolder.webxdcView.setVisibility(View.GONE);
      viewHolder.date.setVisibility(View.GONE);
    }

-    viewHolder.itemView.setOnLongClickListener(view -> { itemClickListener.onMediaLongClicked(dcMsg); return true; });
+    viewHolder.itemView.setOnLongClickListener(
+        view -> {
+          itemClickListener.onMediaLongClicked(dcMsg);
+          return true;
+        });
    viewHolder.itemView.setSelected(selected.contains(dcMsg));

-    viewHolder.date.setText(DateUtils.getBriefRelativeTimeSpanString(context, dcMsg.getTimestamp()));
+    viewHolder.date.setText(
+        DateUtils.getBriefRelativeTimeSpanString(context, dcMsg.getTimestamp()));
  }

  @Override
@@ -177,6 +197,7 @@ class AllMediaDocumentsAdapter extends StickyHeaderGridAdapter {

  interface ItemClickListener {
    void onMediaClicked(@NonNull DcMsg mediaRecord);
+
    void onMediaLongClicked(DcMsg mediaRecord);
  }
 }
@@ -12,31 +12,27 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.view.ActionMode;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEvent;
 import com.b44t.messenger.DcMsg;
 import com.codewaves.stickyheadergrid.StickyHeaderGridLayoutManager;
-
+import java.util.Set;
+import org.thoughtcrime.securesms.components.audioplay.AudioPlaybackViewModel;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader;
 import org.thoughtcrime.securesms.util.ViewUtil;

-import java.util.Set;
-
-public class AllMediaDocumentsFragment
-    extends MessageSelectorFragment
+public class AllMediaDocumentsFragment extends MessageSelectorFragment
    implements LoaderManager.LoaderCallbacks<BucketedThreadMediaLoader.BucketedThreadMedia>,
-               AllMediaDocumentsAdapter.ItemClickListener
-{
+        AllMediaDocumentsAdapter.ItemClickListener {
  public static final String CHAT_ID_EXTRA = "chat_id";
  public static final String VIEWTYPE1 = "viewtype1";
  public static final String VIEWTYPE2 = "viewtype2";
@@ -48,7 +44,7 @@ public class AllMediaDocumentsFragment
  private int viewtype1;
  private int viewtype2;

-  protected int                chatId;
+  protected int chatId;

  @Override
  public void onCreate(Bundle bundle) {
@@ -62,19 +58,23 @@ public class AllMediaDocumentsFragment
  }

  @Override
-  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+  public View onCreateView(
+      @NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
    View view = inflater.inflate(R.layout.profile_documents_fragment, container, false);

    this.recyclerView = ViewUtil.findById(view, R.id.recycler_view);
-    this.noMedia      = ViewUtil.findById(view, R.id.no_documents);
-    this.gridManager  = new StickyHeaderGridLayoutManager(1);
+    this.noMedia = ViewUtil.findById(view, R.id.no_documents);
+    this.gridManager = new StickyHeaderGridLayoutManager(1);

    // add padding to avoid content hidden behind system bars
    ViewUtil.applyWindowInsets(recyclerView, true, false, true, true);

-    this.recyclerView.setAdapter(new AllMediaDocumentsAdapter(getContext(),
-        new BucketedThreadMediaLoader.BucketedThreadMedia(getContext()),
-        this));
+    AllMediaDocumentsAdapter adapter =
+        new AllMediaDocumentsAdapter(
+            getContext(), new BucketedThreadMediaLoader.BucketedThreadMedia(getContext()), this);
+    this.recyclerView.setAdapter(adapter);
+    adapter.setPlaybackViewModel(
+        new ViewModelProvider(requireActivity()).get(AudioPlaybackViewModel.class));
    this.recyclerView.setLayoutManager(gridManager);
    this.recyclerView.setHasFixedSize(true);

@@ -105,12 +105,15 @@ public class AllMediaDocumentsFragment
  }

  @Override
-  public Loader<BucketedThreadMediaLoader.BucketedThreadMedia> onCreateLoader(int i, Bundle bundle) {
+  public Loader<BucketedThreadMediaLoader.BucketedThreadMedia> onCreateLoader(
+      int i, Bundle bundle) {
    return new BucketedThreadMediaLoader(getContext(), chatId, viewtype1, viewtype2, 0);
  }

  @Override
-  public void onLoadFinished(Loader<BucketedThreadMediaLoader.BucketedThreadMedia> loader, BucketedThreadMediaLoader.BucketedThreadMedia bucketedThreadMedia) {
+  public void onLoadFinished(
+      Loader<BucketedThreadMediaLoader.BucketedThreadMedia> loader,
+      BucketedThreadMediaLoader.BucketedThreadMedia bucketedThreadMedia) {
    ((AllMediaDocumentsAdapter) recyclerView.getAdapter()).setMedia(bucketedThreadMedia);
    ((AllMediaDocumentsAdapter) recyclerView.getAdapter()).notifyAllSectionsDataSetChanged();

@@ -118,7 +121,7 @@ public class AllMediaDocumentsFragment
    if (chatId == DC_CHAT_NO_CHAT) {
      if (viewtype1 == DcMsg.DC_MSG_WEBXDC) {
        noMedia.setText(R.string.all_apps_empty_hint);
-      } else if (viewtype1 == DcMsg.DC_MSG_FILE){
+      } else if (viewtype1 == DcMsg.DC_MSG_FILE) {
        noMedia.setText(R.string.all_files_empty_hint);
      } else {
        noMedia.setText(R.string.tab_all_media_empty_hint);
@@ -133,7 +136,8 @@ public class AllMediaDocumentsFragment

  @Override
  public void onLoaderReset(Loader<BucketedThreadMediaLoader.BucketedThreadMedia> cursorLoader) {
-    ((AllMediaDocumentsAdapter) recyclerView.getAdapter()).setMedia(new BucketedThreadMediaLoader.BucketedThreadMedia(getContext()));
+    ((AllMediaDocumentsAdapter) recyclerView.getAdapter())
+        .setMedia(new BucketedThreadMediaLoader.BucketedThreadMedia(getContext()));
  }

  @Override
@@ -164,7 +168,7 @@ public class AllMediaDocumentsFragment

  private void handleMediaPreviewClick(@NonNull DcMsg dcMsg) {
    // audio is started by the play-button
-    if (dcMsg.getType()==DcMsg.DC_MSG_AUDIO || dcMsg.getType()==DcMsg.DC_MSG_VOICE) {
+    if (dcMsg.getType() == DcMsg.DC_MSG_AUDIO || dcMsg.getType() == DcMsg.DC_MSG_VOICE) {
      return;
    }

@@ -212,7 +216,8 @@ public class AllMediaDocumentsFragment
    }
    menu.findItem(R.id.menu_resend).setVisible(canResend);

-    boolean webxdcApp = singleSelection && messageRecords.iterator().next().getType() == DcMsg.DC_MSG_WEBXDC;
+    boolean webxdcApp =
+        singleSelection && messageRecords.iterator().next().getType() == DcMsg.DC_MSG_WEBXDC;
    menu.findItem(R.id.menu_add_to_home_screen).setVisible(webxdcApp);
  }

@@ -239,19 +244,26 @@ public class AllMediaDocumentsFragment
    @Override
    public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
      int itemId = menuItem.getItemId();
+      AudioPlaybackViewModel playbackViewModel =
+          new ViewModelProvider(requireActivity()).get(AudioPlaybackViewModel.class);
      if (itemId == R.id.details) {
        handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
        mode.finish();
        return true;
      } else if (itemId == R.id.delete) {
-        handleDeleteMessages(chatId, getListAdapter().getSelectedMedia());
+        handleDeleteMessages(
+            chatId,
+            getListAdapter().getSelectedMedia(),
+            playbackViewModel::stopByIds,
+            playbackViewModel::stopByIds);
        mode.finish();
        return true;
      } else if (itemId == R.id.share) {
        handleShare(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
        return true;
      } else if (itemId == R.id.menu_add_to_home_screen) {
-        WebxdcActivity.addToHomeScreen(getActivity(), getSelectedMessageRecord(getListAdapter().getSelectedMedia()).getId());
+        WebxdcActivity.addToHomeScreen(
+            getActivity(), getSelectedMessageRecord(getListAdapter().getSelectedMedia()).getId());
        mode.finish();
        return true;
      } else if (itemId == R.id.show_in_chat) {
@@ -5,38 +5,34 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-
 import androidx.annotation.NonNull;
-
 import com.b44t.messenger.DcMsg;
 import com.codewaves.stickyheadergrid.StickyHeaderGridAdapter;
-
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import org.thoughtcrime.securesms.components.ThumbnailView;
 import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader.BucketedThreadMedia;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.util.MediaUtil;

-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
 class AllMediaGalleryAdapter extends StickyHeaderGridAdapter {

-  private final Context             context;
-  private final GlideRequests       glideRequests;
-  private final ItemClickListener   itemClickListener;
-  private final Set<DcMsg>    selected;
+  private final Context context;
+  private final GlideRequests glideRequests;
+  private final ItemClickListener itemClickListener;
+  private final Set<DcMsg> selected;

-  private  BucketedThreadMedia media;
+  private BucketedThreadMedia media;

  private static class ViewHolder extends StickyHeaderGridAdapter.ItemViewHolder {
    final ThumbnailView imageView;
-    final View          selectedIndicator;
+    final View selectedIndicator;

    ViewHolder(View v) {
      super(v);
-      imageView         = v.findViewById(R.id.image);
+      imageView = v.findViewById(R.id.image);
      selectedIndicator = v.findViewById(R.id.selected_indicator);
    }
  }
@@ -50,16 +46,16 @@ class AllMediaGalleryAdapter extends StickyHeaderGridAdapter {
    }
  }

-  AllMediaGalleryAdapter(@NonNull Context context,
-                         @NonNull GlideRequests glideRequests,
-                         BucketedThreadMedia media,
-                         ItemClickListener clickListener)
-  {
-    this.context           = context;
-    this.glideRequests     = glideRequests;
-    this.media             = media;
+  AllMediaGalleryAdapter(
+      @NonNull Context context,
+      @NonNull GlideRequests glideRequests,
+      BucketedThreadMedia media,
+      ItemClickListener clickListener) {
+    this.context = context;
+    this.glideRequests = glideRequests;
+    this.media = media;
    this.itemClickListener = clickListener;
-    this.selected          = new HashSet<>();
+    this.selected = new HashSet<>();
  }

  public void setMedia(BucketedThreadMedia media) {
@@ -67,36 +63,42 @@ class AllMediaGalleryAdapter extends StickyHeaderGridAdapter {
  }

  @Override
-  public StickyHeaderGridAdapter.HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent, int headerType) {
-    return new HeaderHolder(LayoutInflater.from(context).inflate(R.layout.contact_selection_list_divider, parent, false));
+  public StickyHeaderGridAdapter.HeaderViewHolder onCreateHeaderViewHolder(
+      ViewGroup parent, int headerType) {
+    return new HeaderHolder(
+        LayoutInflater.from(context)
+            .inflate(R.layout.contact_selection_list_divider, parent, false));
  }

  @Override
  public ItemViewHolder onCreateItemViewHolder(ViewGroup parent, int itemType) {
-    return new ViewHolder(LayoutInflater.from(context).inflate(R.layout.profile_gallery_item, parent, false));
+    return new ViewHolder(
+        LayoutInflater.from(context).inflate(R.layout.profile_gallery_item, parent, false));
  }

  @Override
-  public void onBindHeaderViewHolder(StickyHeaderGridAdapter.HeaderViewHolder viewHolder, int section) {
-    ((HeaderHolder)viewHolder).textView.setText(media.getName(section));
+  public void onBindHeaderViewHolder(
+      StickyHeaderGridAdapter.HeaderViewHolder viewHolder, int section) {
+    ((HeaderHolder) viewHolder).textView.setText(media.getName(section));
  }

  @Override
  public void onBindItemViewHolder(ItemViewHolder viewHolder, int section, int offset) {
-    DcMsg         mediaRecord       = media.get(section, offset);
-    ThumbnailView thumbnailView     = ((ViewHolder)viewHolder).imageView;
-    View          selectedIndicator = ((ViewHolder)viewHolder).selectedIndicator;
-    Slide         slide             = MediaUtil.getSlideForMsg(context, mediaRecord);
+    DcMsg mediaRecord = media.get(section, offset);
+    ThumbnailView thumbnailView = ((ViewHolder) viewHolder).imageView;
+    View selectedIndicator = ((ViewHolder) viewHolder).selectedIndicator;
+    Slide slide = MediaUtil.getSlideForMsg(context, mediaRecord);

    if (slide != null) {
      thumbnailView.setImageResource(glideRequests, slide);
    }

    thumbnailView.setOnClickListener(view -> itemClickListener.onMediaClicked(mediaRecord));
-    thumbnailView.setOnLongClickListener(view -> {
-      itemClickListener.onMediaLongClicked(mediaRecord);
-      return true;
-    });
+    thumbnailView.setOnLongClickListener(
+        view -> {
+          itemClickListener.onMediaLongClicked(mediaRecord);
+          return true;
+        });

    selectedIndicator.setVisibility(selected.contains(mediaRecord) ? View.VISIBLE : View.GONE);
  }
@@ -139,6 +141,7 @@ class AllMediaGalleryAdapter extends StickyHeaderGridAdapter {

  interface ItemClickListener {
    void onMediaClicked(@NonNull DcMsg mediaRecord);
+
    void onMediaLongClicked(DcMsg mediaRecord);
  }
 }
@@ -12,19 +12,17 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.view.ActionMode;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEvent;
 import com.b44t.messenger.DcMsg;
 import com.codewaves.stickyheadergrid.StickyHeaderGridLayoutManager;
-
+import java.util.Set;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.database.Address;
@@ -32,13 +30,9 @@ import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.util.ViewUtil;

-import java.util.Set;
-
-public class AllMediaGalleryFragment
-    extends MessageSelectorFragment
+public class AllMediaGalleryFragment extends MessageSelectorFragment
    implements LoaderManager.LoaderCallbacks<BucketedThreadMediaLoader.BucketedThreadMedia>,
-               AllMediaGalleryAdapter.ItemClickListener
-{
+        AllMediaGalleryAdapter.ItemClickListener {
  public static final String CHAT_ID_EXTRA = "chat_id";

  protected TextView noMedia;
@@ -46,7 +40,7 @@ public class AllMediaGalleryFragment
  private StickyHeaderGridLayoutManager gridManager;
  private final ActionModeCallback actionModeCallback = new ActionModeCallback();

-  private int                  chatId;
+  private int chatId;

  @Override
  public void onCreate(Bundle bundle) {
@@ -58,20 +52,23 @@ public class AllMediaGalleryFragment
  }

  @Override
-  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+  public View onCreateView(
+      @NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
    View view = inflater.inflate(R.layout.profile_gallery_fragment, container, false);

    this.recyclerView = ViewUtil.findById(view, R.id.media_grid);
-    this.noMedia      = ViewUtil.findById(view, R.id.no_images);
-    this.gridManager  = new StickyHeaderGridLayoutManager(getCols());
+    this.noMedia = ViewUtil.findById(view, R.id.no_images);
+    this.gridManager = new StickyHeaderGridLayoutManager(getCols());

    // add padding to avoid content hidden behind system bars
    ViewUtil.applyWindowInsets(recyclerView, true, false, true, true);

-    this.recyclerView.setAdapter(new AllMediaGalleryAdapter(getContext(),
-                                                         GlideApp.with(this),
-                                                         new BucketedThreadMediaLoader.BucketedThreadMedia(getContext()),
-                                                         this));
+    this.recyclerView.setAdapter(
+        new AllMediaGalleryAdapter(
+            getContext(),
+            GlideApp.with(this),
+            new BucketedThreadMediaLoader.BucketedThreadMedia(getContext()),
+            this));
    this.recyclerView.setLayoutManager(gridManager);
    this.recyclerView.setHasFixedSize(true);

@@ -94,7 +91,9 @@ public class AllMediaGalleryFragment
  }

  private int getCols() {
-    return getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE? 5 : 3;
+    return getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE
+        ? 5
+        : 3;
  }

  @Override
@@ -107,12 +106,16 @@ public class AllMediaGalleryFragment
  }

  @Override
-  public Loader<BucketedThreadMediaLoader.BucketedThreadMedia> onCreateLoader(int i, Bundle bundle) {
-    return new BucketedThreadMediaLoader(getContext(), chatId, DcMsg.DC_MSG_IMAGE, DcMsg.DC_MSG_GIF, DcMsg.DC_MSG_VIDEO);
+  public Loader<BucketedThreadMediaLoader.BucketedThreadMedia> onCreateLoader(
+      int i, Bundle bundle) {
+    return new BucketedThreadMediaLoader(
+        getContext(), chatId, DcMsg.DC_MSG_IMAGE, DcMsg.DC_MSG_GIF, DcMsg.DC_MSG_VIDEO);
  }

  @Override
-  public void onLoadFinished(Loader<BucketedThreadMediaLoader.BucketedThreadMedia> loader, BucketedThreadMediaLoader.BucketedThreadMedia bucketedThreadMedia) {
+  public void onLoadFinished(
+      Loader<BucketedThreadMediaLoader.BucketedThreadMedia> loader,
+      BucketedThreadMediaLoader.BucketedThreadMedia bucketedThreadMedia) {
    ((AllMediaGalleryAdapter) recyclerView.getAdapter()).setMedia(bucketedThreadMedia);
    ((AllMediaGalleryAdapter) recyclerView.getAdapter()).notifyAllSectionsDataSetChanged();

@@ -125,7 +128,8 @@ public class AllMediaGalleryFragment

  @Override
  public void onLoaderReset(Loader<BucketedThreadMediaLoader.BucketedThreadMedia> cursorLoader) {
-    ((AllMediaGalleryAdapter) recyclerView.getAdapter()).setMedia(new BucketedThreadMediaLoader.BucketedThreadMedia(getContext()));
+    ((AllMediaGalleryAdapter) recyclerView.getAdapter())
+        .setMedia(new BucketedThreadMediaLoader.BucketedThreadMedia(getContext()));
  }

  @Override
@@ -9,7 +9,6 @@ import android.net.LinkProperties;
 import android.net.NetworkCapabilities;
 import android.os.Build;
 import android.util.Log;
-
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.app.NotificationManagerCompat;
@@ -19,13 +18,19 @@ import androidx.work.ExistingPeriodicWorkPolicy;
 import androidx.work.NetworkType;
 import androidx.work.PeriodicWorkRequest;
 import androidx.work.WorkManager;
-
+import chat.delta.rpc.Rpc;
+import chat.delta.rpc.RpcException;
 import com.b44t.messenger.DcAccounts;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEvent;
+import com.b44t.messenger.DcEventChannel;
 import com.b44t.messenger.DcEventEmitter;
 import com.b44t.messenger.FFITransport;
-
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.concurrent.TimeUnit;
+import org.thoughtcrime.securesms.calls.CallCoordinator;
 import org.thoughtcrime.securesms.connect.AccountManager;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
@@ -47,35 +52,27 @@ import org.thoughtcrime.securesms.util.SignalProtocolLoggerProvider;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.webxdc.WebxdcGarbageCollectionWorker;

-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.concurrent.TimeUnit;
-
-import chat.delta.rpc.Rpc;
-import chat.delta.rpc.RpcException;
-
 public class ApplicationContext extends MultiDexApplication {
  private static final String TAG = ApplicationContext.class.getSimpleName();
  private static final Object initLock = new Object();
  private static volatile boolean isInitialized = false;

-  private static DcAccounts      dcAccounts;
-  private Rpc                    rpc;
-  private DcContext              dcContext;
+  private static DcAccounts dcAccounts;
+  private Rpc rpc;
+  private DcContext dcContext;

-  private DcLocationManager      dcLocationManager;
-  private DcEventCenter          eventCenter;
-  private NotificationCenter     notificationCenter;
-  private JobManager            jobManager;
+  private DcLocationManager dcLocationManager;
+  private DcEventCenter eventCenter;
+  private NotificationCenter notificationCenter;
+  private JobManager jobManager;

-  private int                   debugOnAvailableCount;
-  private int                   debugOnBlockedStatusChangedCount;
-  private int                   debugOnCapabilitiesChangedCount;
-  private int                   debugOnLinkPropertiesChangedCount;
+  private int debugOnAvailableCount;
+  private int debugOnBlockedStatusChangedCount;
+  private int debugOnCapabilitiesChangedCount;
+  private int debugOnLinkPropertiesChangedCount;

  public static ApplicationContext getInstance(@NonNull Context context) {
-    return (ApplicationContext)context.getApplicationContext();
+    return (ApplicationContext) context.getApplicationContext();
  }

  private static void ensureInitialized() {
@@ -92,8 +89,8 @@ public class ApplicationContext extends MultiDexApplication {
  }

  /**
-   * Get DcAccounts instance, waiting for initialization if necessary.
-   * This method is thread-safe and will block until initialization is complete.
+   * Get DcAccounts instance, waiting for initialization if necessary. This method is thread-safe
+   * and will block until initialization is complete.
   */
  public static DcAccounts getDcAccounts() {
    ensureInitialized();
@@ -101,8 +98,8 @@ public class ApplicationContext extends MultiDexApplication {
  }

  /**
-   * Get Rpc instance, waiting for initialization if necessary.
-   * This method is thread-safe and will block until initialization is complete.
+   * Get Rpc instance, waiting for initialization if necessary. This method is thread-safe and will
+   * block until initialization is complete.
   */
  public Rpc getRpc() {
    ensureInitialized();
@@ -110,8 +107,8 @@ public class ApplicationContext extends MultiDexApplication {
  }

  /**
-   * Get DcContext instance, waiting for initialization if necessary.
-   * This method is thread-safe and will block until initialization is complete.
+   * Get DcContext instance, waiting for initialization if necessary. This method is thread-safe and
+   * will block until initialization is complete.
   */
  public DcContext getDcContext() {
    ensureInitialized();
@@ -120,8 +117,8 @@ public class ApplicationContext extends MultiDexApplication {

  /**
   * Set DcContext instance. This should only be called by AccountManager when switching accounts,
-   * which only happens after initial initialization is complete.
-   * This method is thread-safe but does NOT trigger initialization or notify waiting threads.
+   * which only happens after initial initialization is complete. This method is thread-safe but
+   * does NOT trigger initialization or notify waiting threads.
   */
  public void setDcContext(DcContext dcContext) {
    synchronized (initLock) {
@@ -130,8 +127,8 @@ public class ApplicationContext extends MultiDexApplication {
  }

  /**
-   * Get DcLocationManager instance, waiting for initialization if necessary.
-   * This method is thread-safe and will block until initialization is complete.
+   * Get DcLocationManager instance, waiting for initialization if necessary. This method is
+   * thread-safe and will block until initialization is complete.
   */
  public DcLocationManager getLocationManager() {
    ensureInitialized();
@@ -139,8 +136,8 @@ public class ApplicationContext extends MultiDexApplication {
  }

  /**
-   * Get DcEventCenter instance, waiting for initialization if necessary.
-   * This method is thread-safe and will block until initialization is complete.
+   * Get DcEventCenter instance, waiting for initialization if necessary. This method is thread-safe
+   * and will block until initialization is complete.
   */
  public DcEventCenter getEventCenter() {
    ensureInitialized();
@@ -148,8 +145,8 @@ public class ApplicationContext extends MultiDexApplication {
  }

  /**
-   * Get NotificationCenter instance, waiting for initialization if necessary.
-   * This method is thread-safe and will block until initialization is complete.
+   * Get NotificationCenter instance, waiting for initialization if necessary. This method is
+   * thread-safe and will block until initialization is complete.
   */
  public NotificationCenter getNotificationCenter() {
    ensureInitialized();
@@ -160,25 +157,30 @@ public class ApplicationContext extends MultiDexApplication {
  public void onCreate() {
    super.onCreate();

-    Thread.setDefaultUncaughtExceptionHandler((thread, throwable) -> {
-      StringWriter stringWriter = new StringWriter();
-      throwable.printStackTrace(new PrintWriter(stringWriter, true));
-      String errorMsg = "Android " + Build.VERSION.RELEASE +":\n" + stringWriter.getBuffer().toString();
-      String subject = "ArcaneChat " + BuildConfig.VERSION_NAME + " Crash Report";
-      Intent intent = new Intent(android.content.Intent.ACTION_SEND);
-      intent.setType("text/plain");
-      intent.putExtra(android.content.Intent.EXTRA_SUBJECT, subject);
-      intent.putExtra(android.content.Intent.EXTRA_TEXT, subject + "\n\n" + errorMsg);
-      intent.putExtra(Intent.EXTRA_EMAIL, "adb@merlinux.eu");
-      Intent chooser = Intent.createChooser(intent, subject);
-      chooser.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-      chooser.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-      startActivity(chooser);
+    Thread.setDefaultUncaughtExceptionHandler(
+        (thread, throwable) -> {
+          StringWriter stringWriter = new StringWriter();
+          throwable.printStackTrace(new PrintWriter(stringWriter, true));
+          String errorMsg =
+              "Android " + Build.VERSION.RELEASE + ":\n" + stringWriter.getBuffer().toString();
+          errorMsg += "\n" + LogViewFragment.grabLogcat();
+          String subject =
+              "ArcaneChat " + BuildConfig.VERSION_NAME + "-" + BuildConfig.FLAVOR + " Crash Report";
+          Intent intent = new Intent(android.content.Intent.ACTION_SEND);
+          intent.setType("text/plain");
+          intent.putExtra(android.content.Intent.EXTRA_SUBJECT, subject);
+          intent.putExtra(android.content.Intent.EXTRA_TEXT, subject + "\n\n" + errorMsg);
+          intent.putExtra(Intent.EXTRA_EMAIL, "adb@merlinux.eu");
+          Intent chooser = Intent.createChooser(intent, subject);
+          chooser.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+          chooser.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+          startActivity(chooser);

-      try {
-        ApplicationContext.this.finalize();
-      } catch (Throwable e) {}
-    });
+          try {
+            ApplicationContext.this.finalize();
+          } catch (Throwable e) {
+          }
+        });

    // if (LeakCanary.isInAnalyzerProcess(this)) {
    //   // This process is dedicated to LeakCanary for heap analysis.
@@ -192,84 +194,114 @@ public class ApplicationContext extends MultiDexApplication {
    System.loadLibrary("native-utils");

    // Initialize DcAccounts in background to avoid ANR during SQL migrations
-    Util.runOnBackground(() -> {
-      synchronized (initLock) {
-        try {
-          dcAccounts = new DcAccounts(new File(getFilesDir(), "accounts").getAbsolutePath());
-          Log.i(TAG, "DcAccounts created");
-          rpc = new Rpc(new FFITransport(dcAccounts.getJsonrpcInstance()));
-          Log.i(TAG, "Rpc created");
-          AccountManager.getInstance().migrateToDcAccounts(this);
-
-          int[] allAccounts = dcAccounts.getAll();
-          Log.i(TAG, "Number of profiles: " + allAccounts.length);
-          for (int accountId : allAccounts) {
-            DcContext ac = dcAccounts.getAccount(accountId);
-            if (!ac.isOpen()) {
-              try {
-                DatabaseSecret secret = DatabaseSecretProvider.getOrCreateDatabaseSecret(this, accountId);
-                boolean res = ac.open(secret.asString());
-                if (res) Log.i(TAG, "Successfully opened account " + accountId + ", path: " + ac.getBlobdir());
-                else Log.e(TAG, "Error opening account " + accountId + ", path: " + ac.getBlobdir());
-              } catch (Exception e) {
-                Log.e(TAG, "Failed to open account " + accountId + ", path: " + ac.getBlobdir() + ": " + e);
-                e.printStackTrace();
-              }
-            }
-
-            // 2025-12-16: The setting was removed.
-            // Revert it to the default if it was changed in the past.
-            ac.setConfigInt("webxdc_realtime_enabled", 1);
-
-            // 2025-11-12: this is needed until core starts ignoring "delete_server_after" for chatmail
-            if (ac.isChatmail()) {
-              ac.setConfig("delete_server_after", null); // reset
-            }
-          }
-          if (allAccounts.length == 0) {
+    Util.runOnBackground(
+        () -> {
+          synchronized (initLock) {
            try {
-              rpc.addAccount();
-            } catch (RpcException e) {
-              e.printStackTrace();
+              DcEventChannel eventChannel = new DcEventChannel();
+              DcEventEmitter emitter = eventChannel.getEventEmitter();
+              eventCenter = new DcEventCenter(this);
+
+              new Thread(
+                      () -> {
+                        Log.i(TAG, "Starting event loop");
+                        while (true) {
+                          DcEvent event = emitter.getNextEvent();
+                          if (event == null) {
+                            break;
+                          }
+                          if (isInitialized) {
+                            eventCenter.handleEvent(event);
+                          } else {
+                            // not fully initialized, only handle logging events,
+                            // ex. account migrations during DcAccounts initialization
+                            eventCenter.handleLogging(event);
+                          }
+                        }
+                        Log.i("DeltaChat", "shutting down event handler");
+                      },
+                      "eventThread")
+                  .start();
+
+              dcAccounts =
+                  new DcAccounts(
+                      new File(getFilesDir(), "accounts").getAbsolutePath(), eventChannel);
+              Log.i(TAG, "DcAccounts created");
+              rpc = new Rpc(new FFITransport(dcAccounts.getJsonrpcInstance()));
+              Log.i(TAG, "Rpc created");
+              AccountManager.getInstance().migrateToDcAccounts(this);
+
+              int[] allAccounts = dcAccounts.getAll();
+              Log.i(TAG, "Number of profiles: " + allAccounts.length);
+              for (int accountId : allAccounts) {
+                DcContext ac = dcAccounts.getAccount(accountId);
+                if (!ac.isOpen()) {
+                  try {
+                    DatabaseSecret secret =
+                        DatabaseSecretProvider.getOrCreateDatabaseSecret(this, accountId);
+                    boolean res = ac.open(secret.asString());
+                    if (res)
+                      Log.i(
+                          TAG,
+                          "Successfully opened account "
+                              + accountId
+                              + ", path: "
+                              + ac.getBlobdir());
+                    else
+                      Log.e(
+                          TAG, "Error opening account " + accountId + ", path: " + ac.getBlobdir());
+                  } catch (Exception e) {
+                    Log.e(
+                        TAG,
+                        "Failed to open account "
+                            + accountId
+                            + ", path: "
+                            + ac.getBlobdir()
+                            + ": "
+                            + e);
+                    e.printStackTrace();
+                  }
+                }
+
+                // 2025-12-16: The setting was removed.
+                // Revert it to the default if it was changed in the past.
+                ac.setConfigInt("webxdc_realtime_enabled", 1);
+
+                // 2025-11-12: this is needed until core starts ignoring "delete_server_after" for
+                // chatmail
+                if (ac.isChatmail()) {
+                  ac.setConfig("delete_server_after", null); // reset
+                }
+              }
+              if (allAccounts.length == 0) {
+                try {
+                  rpc.addAccount();
+                } catch (RpcException e) {
+                  e.printStackTrace();
+                }
+              }
+              dcContext = dcAccounts.getSelectedAccount();
+              notificationCenter = new NotificationCenter(this);
+              dcLocationManager = new DcLocationManager(this, dcContext);
+
+              isInitialized = true;
+              initLock.notifyAll();
+              Log.i(TAG, "DcAccounts initialization complete");
+
+              // set translations before starting I/O to avoid sending untranslated MDNs (issue
+              // #2288)
+              DcHelper.setStockTranslations(this);
+
+              dcAccounts.startIo();
+            } catch (Exception e) {
+              Log.e(TAG, "Fatal error during DcAccounts initialization", e);
+              // Mark as initialized even on error to avoid deadlock
+              isInitialized = true;
+              initLock.notifyAll();
+              throw new RuntimeException("Failed to initialize DcAccounts", e);
            }
          }
-          dcContext = dcAccounts.getSelectedAccount();
-          notificationCenter = new NotificationCenter(this);
-          eventCenter = new DcEventCenter(this);
-          dcLocationManager = new DcLocationManager(this, dcContext);
-
-          // Mark as initialized before starting threads that depend on it
-          isInitialized = true;
-          initLock.notifyAll();
-          Log.i(TAG, "DcAccounts initialization complete");
-
-          new Thread(() -> {
-              Log.i(TAG, "Starting event loop");
-              DcEventEmitter emitter = dcAccounts.getEventEmitter();
-              Log.i(TAG, "DcEventEmitter obtained");
-              while (true) {
-                DcEvent event = emitter.getNextEvent();
-                if (event==null) {
-                  break;
-                }
-                eventCenter.handleEvent(event);
-              }
-              Log.i("DeltaChat", "shutting down event handler");
-          }, "eventThread").start();
-
-          // set translations before starting I/O to avoid sending untranslated MDNs (issue #2288)
-          DcHelper.setStockTranslations(this);
-
-          dcAccounts.startIo();
-        } catch (Exception e) {
-          Log.e(TAG, "Fatal error during DcAccounts initialization", e);
-          // Mark as initialized even on error to avoid deadlock
-          isInitialized = true;
-          initLock.notifyAll();
-          throw new RuntimeException("Failed to initialize DcAccounts", e);
-        }
-      }
-    });
+        });

    // October-2025 migration: delete deprecated "permanent channel" id
    NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
@@ -280,33 +312,50 @@ public class ApplicationContext extends MultiDexApplication {

    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
      ConnectivityManager connectivityManager =
-        (ConnectivityManager) this.getSystemService(Context.CONNECTIVITY_SERVICE);
-      connectivityManager.registerDefaultNetworkCallback(new ConnectivityManager.NetworkCallback() {
-        @Override
-        public void onAvailable(@NonNull android.net.Network network) {
-          Log.i("DeltaChat", "++++++++++++++++++ NetworkCallback.onAvailable() #" + debugOnAvailableCount++);
-          getDcAccounts().maybeNetwork();
-        }
+          (ConnectivityManager) this.getSystemService(Context.CONNECTIVITY_SERVICE);
+      connectivityManager.registerDefaultNetworkCallback(
+          new ConnectivityManager.NetworkCallback() {
+            @Override
+            public void onAvailable(@NonNull android.net.Network network) {
+              Log.i(
+                  "DeltaChat",
+                  "++++++++++++++++++ NetworkCallback.onAvailable() #" + debugOnAvailableCount++);
+              getDcAccounts().maybeNetwork();
+            }

-        @Override
-        public void onBlockedStatusChanged(@NonNull android.net.Network network, boolean blocked) {
-          Log.i("DeltaChat", "++++++++++++++++++ NetworkCallback.onBlockedStatusChanged() #" + debugOnBlockedStatusChangedCount++);
-        }
+            @Override
+            public void onBlockedStatusChanged(
+                @NonNull android.net.Network network, boolean blocked) {
+              Log.i(
+                  "DeltaChat",
+                  "++++++++++++++++++ NetworkCallback.onBlockedStatusChanged() #"
+                      + debugOnBlockedStatusChangedCount++);
+            }

-        @Override
-        public void onCapabilitiesChanged(@NonNull android.net.Network network, NetworkCapabilities networkCapabilities) {
-          // usually called after onAvailable(), so a maybeNetwork seems contraproductive
-          Log.i("DeltaChat", "++++++++++++++++++ NetworkCallback.onCapabilitiesChanged() #" + debugOnCapabilitiesChangedCount++);
-        }
+            @Override
+            public void onCapabilitiesChanged(
+                @NonNull android.net.Network network, NetworkCapabilities networkCapabilities) {
+              // usually called after onAvailable(), so a maybeNetwork seems contraproductive
+              Log.i(
+                  "DeltaChat",
+                  "++++++++++++++++++ NetworkCallback.onCapabilitiesChanged() #"
+                      + debugOnCapabilitiesChangedCount++);
+            }

-        @Override
-        public void onLinkPropertiesChanged(@NonNull android.net.Network network, LinkProperties linkProperties) {
-          Log.i("DeltaChat", "++++++++++++++++++ NetworkCallback.onLinkPropertiesChanged() #" + debugOnLinkPropertiesChangedCount++);
-        }
-      });
+            @Override
+            public void onLinkPropertiesChanged(
+                @NonNull android.net.Network network, LinkProperties linkProperties) {
+              Log.i(
+                  "DeltaChat",
+                  "++++++++++++++++++ NetworkCallback.onLinkPropertiesChanged() #"
+                      + debugOnLinkPropertiesChangedCount++);
+            }
+          });
    } // no else: use old method for debugging
    BroadcastReceiver networkStateReceiver = new NetworkStateReceiver();
-    registerReceiver(networkStateReceiver, new IntentFilter(android.net.ConnectivityManager.CONNECTIVITY_ACTION));
+    registerReceiver(
+        networkStateReceiver,
+        new IntentFilter(android.net.ConnectivityManager.CONNECTIVITY_ACTION));

    KeepAliveService.maybeStartSelf(this);

@@ -314,16 +363,23 @@ public class ApplicationContext extends MultiDexApplication {
    initializeJobManager();
    InChatSounds.getInstance(this);

+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      EglUtils.getEglBase();
+      CallCoordinator.getInstance(this);
+    }
+
    DynamicTheme.setDefaultDayNightMode(this);

    IntentFilter filter = new IntentFilter(Intent.ACTION_LOCALE_CHANGED);
-    registerReceiver(new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
+    registerReceiver(
+        new BroadcastReceiver() {
+          @Override
+          public void onReceive(Context context, Intent intent) {
            Util.localeChanged();
            DcHelper.setStockTranslations(context);
-        }
-    }, filter);
+          }
+        },
+        filter);

    AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);

@@ -334,31 +390,34 @@ public class ApplicationContext extends MultiDexApplication {
      // MAYBE TODO: i think the ApplicationContext is also created
      // when the app is stated by FetchWorker timeouts.
      // in this case, the normal threads shall not be started.
-      Constraints constraints = new Constraints.Builder()
-              .setRequiredNetworkType(NetworkType.CONNECTED)
-              .build();
-      PeriodicWorkRequest fetchWorkRequest = new PeriodicWorkRequest.Builder(
-              FetchWorker.class,
-              PeriodicWorkRequest.MIN_PERIODIC_INTERVAL_MILLIS, // usually 15 minutes
-              TimeUnit.MILLISECONDS,
-              PeriodicWorkRequest.MIN_PERIODIC_FLEX_MILLIS, // the start may be preferred by up to 5 minutes, so we run every 10-15 minutes
-              TimeUnit.MILLISECONDS)
+      Constraints constraints =
+          new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build();
+      PeriodicWorkRequest fetchWorkRequest =
+          new PeriodicWorkRequest.Builder(
+                  FetchWorker.class,
+                  PeriodicWorkRequest.MIN_PERIODIC_INTERVAL_MILLIS, // usually 15 minutes
+                  TimeUnit.MILLISECONDS,
+                  PeriodicWorkRequest
+                      .MIN_PERIODIC_FLEX_MILLIS, // the start may be preferred by up to 5 minutes,
+                  // so we run every 10-15 minutes
+                  TimeUnit.MILLISECONDS)
              .setConstraints(constraints)
              .build();
-      WorkManager.getInstance(this).enqueueUniquePeriodicWork(
-              "FetchWorker",
-              ExistingPeriodicWorkPolicy.KEEP,
-              fetchWorkRequest);
+      WorkManager.getInstance(this)
+          .enqueueUniquePeriodicWork(
+              "FetchWorker", ExistingPeriodicWorkPolicy.KEEP, fetchWorkRequest);
    }

-    PeriodicWorkRequest webxdcGarbageCollectionRequest = new PeriodicWorkRequest.Builder(
-            WebxdcGarbageCollectionWorker.class,
-            PeriodicWorkRequest.MIN_PERIODIC_INTERVAL_MILLIS,
-            TimeUnit.MILLISECONDS,
-            PeriodicWorkRequest.MIN_PERIODIC_FLEX_MILLIS,
-            TimeUnit.MILLISECONDS)
+    PeriodicWorkRequest webxdcGarbageCollectionRequest =
+        new PeriodicWorkRequest.Builder(
+                WebxdcGarbageCollectionWorker.class,
+                PeriodicWorkRequest.MIN_PERIODIC_INTERVAL_MILLIS,
+                TimeUnit.MILLISECONDS,
+                PeriodicWorkRequest.MIN_PERIODIC_FLEX_MILLIS,
+                TimeUnit.MILLISECONDS)
            .build();
-    WorkManager.getInstance(this).enqueueUniquePeriodicWork(
+    WorkManager.getInstance(this)
+        .enqueueUniquePeriodicWork(
            "WebxdcGarbageCollectionWorker",
            ExistingPeriodicWorkPolicy.KEEP,
            webxdcGarbageCollectionRequest);
@@ -366,6 +425,14 @@ public class ApplicationContext extends MultiDexApplication {
    Log.i("DeltaChat", "+++++++++++ ApplicationContext.onCreate() finished ++++++++++");
  }

+  @Override
+  public void onTerminate() {
+    super.onTerminate();
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      EglUtils.release();
+    }
+  }
+
  public JobManager getJobManager() {
    return jobManager;
  }
@@ -21,7 +21,8 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
-
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
@@ -30,19 +31,17 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.preference.Preference;
-
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEvent;
-
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.preferences.AdvancedPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.AppearancePreferenceFragment;
 import org.thoughtcrime.securesms.preferences.ChatsPreferenceFragment;
-import org.thoughtcrime.securesms.preferences.PrivacyPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.CorrectedPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.NotificationsPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.PrivacyPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.widgets.ProfilePreference;
 import org.thoughtcrime.securesms.qr.BackupTransferActivity;
 import org.thoughtcrime.securesms.util.DynamicTheme;
@@ -55,24 +54,22 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 * The Activity for application preference display and management.
 *
 * @author Moxie Marlinspike
- *
 */
-
 public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarActivity
-    implements SharedPreferences.OnSharedPreferenceChangeListener
-{
-  private static final String PREFERENCE_CATEGORY_PROFILE        = "preference_category_profile";
-  private static final String PREFERENCE_CATEGORY_NOTIFICATIONS  = "preference_category_notifications";
-  private static final String PREFERENCE_CATEGORY_APPEARANCE     = "preference_category_appearance";
-  private static final String PREFERENCE_CATEGORY_CHATS          = "preference_category_chats";
-  private static final String PREFERENCE_CATEGORY_PRIVACY        = "preference_category_privacy";
-  private static final String PREFERENCE_CATEGORY_MULTIDEVICE    = "preference_category_multidevice";
-  private static final String PREFERENCE_CATEGORY_ADVANCED       = "preference_category_advanced";
-  private static final String PREFERENCE_CATEGORY_CONNECTIVITY   = "preference_category_connectivity";
-  private static final String PREFERENCE_CATEGORY_DONATE         = "preference_category_donate";
-  private static final String PREFERENCE_CATEGORY_HELP           = "preference_category_help";
+    implements SharedPreferences.OnSharedPreferenceChangeListener {
+  private static final String PREFERENCE_CATEGORY_PROFILE = "preference_category_profile";
+  private static final String PREFERENCE_CATEGORY_NOTIFICATIONS =
+      "preference_category_notifications";
+  private static final String PREFERENCE_CATEGORY_APPEARANCE = "preference_category_appearance";
+  private static final String PREFERENCE_CATEGORY_CHATS = "preference_category_chats";
+  private static final String PREFERENCE_CATEGORY_PRIVACY = "preference_category_privacy";
+  private static final String PREFERENCE_CATEGORY_MULTIDEVICE = "preference_category_multidevice";
+  private static final String PREFERENCE_CATEGORY_ADVANCED = "preference_category_advanced";
+  private static final String PREFERENCE_CATEGORY_CONNECTIVITY = "preference_category_connectivity";
+  private static final String PREFERENCE_CATEGORY_DONATE = "preference_category_donate";
+  private static final String PREFERENCE_CATEGORY_HELP = "preference_category_help";

-  public static final int REQUEST_CODE_SET_BACKGROUND            = 11;
+  public static final int REQUEST_CODE_SET_BACKGROUND = 11;

  @Override
  protected void onCreate(Bundle icicle, boolean ready) {
@@ -89,18 +86,6 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
    }
  }

-  @Override
-  protected void onActivityResult(int requestCode, int resultCode, Intent data)
-  {
-    super.onActivityResult(requestCode, resultCode, data);
-    if (resultCode == RESULT_OK && requestCode == ScreenLockUtil.REQUEST_CODE_CONFIRM_CREDENTIALS) {
-      showBackupProvider();
-      return;
-    }
-    Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment);
-    fragment.onActivityResult(requestCode, resultCode, data);
-  }
-
  @Override
  public boolean onSupportNavigateUp() {
    FragmentManager fragmentManager = getSupportFragmentManager();
@@ -125,34 +110,51 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA

  public void showBackupProvider() {
    Intent intent = new Intent(this, BackupTransferActivity.class);
-    intent.putExtra(BackupTransferActivity.TRANSFER_MODE, BackupTransferActivity.TransferMode.SENDER_SHOW_QR.getInt());
+    intent.putExtra(
+        BackupTransferActivity.TRANSFER_MODE,
+        BackupTransferActivity.TransferMode.SENDER_SHOW_QR.getInt());
    startActivity(intent);
-    overridePendingTransition(0, 0); // let the activity appear in the same way as the other pages (which are mostly fragments)
+    overridePendingTransition(
+        0, 0); // let the activity appear in the same way as the other pages (which are mostly
+    // fragments)
    finishAffinity(); // see comment (**2) in BackupTransferActivity.doFinish()
  }

-  public static class ApplicationPreferenceFragment extends CorrectedPreferenceFragment implements DcEventCenter.DcEventDelegate {
+  public static class ApplicationPreferenceFragment extends CorrectedPreferenceFragment
+      implements DcEventCenter.DcEventDelegate {
+    private ActivityResultLauncher<Intent> screenLockLauncher;

    @Override
    public void onCreate(Bundle icicle) {
      super.onCreate(icicle);

+      screenLockLauncher =
+          registerForActivityResult(
+              new ActivityResultContracts.StartActivityForResult(),
+              result -> {
+                if (result.getResultCode() == RESULT_OK) {
+                  ((ApplicationPreferencesActivity) getActivity()).showBackupProvider();
+                }
+              });
+
      this.findPreference(PREFERENCE_CATEGORY_PROFILE)
          .setOnPreferenceClickListener(new ProfileClickListener());
      this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_NOTIFICATIONS));
+          .setOnPreferenceClickListener(
+              new CategoryClickListener(PREFERENCE_CATEGORY_NOTIFICATIONS));
      this.findPreference(PREFERENCE_CATEGORY_CONNECTIVITY)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_CONNECTIVITY));
+          .setOnPreferenceClickListener(
+              new CategoryClickListener(PREFERENCE_CATEGORY_CONNECTIVITY));
      this.findPreference(PREFERENCE_CATEGORY_APPEARANCE)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_APPEARANCE));
+          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_APPEARANCE));
      this.findPreference(PREFERENCE_CATEGORY_CHATS)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_CHATS));
+          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_CHATS));
      this.findPreference(PREFERENCE_CATEGORY_PRIVACY)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_PRIVACY));
+          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_PRIVACY));
      this.findPreference(PREFERENCE_CATEGORY_MULTIDEVICE)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_MULTIDEVICE));
+          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_MULTIDEVICE));
      this.findPreference(PREFERENCE_CATEGORY_ADVANCED)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_ADVANCED));
+          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_ADVANCED));

      this.findPreference(PREFERENCE_CATEGORY_DONATE)
          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_DONATE));
@@ -160,7 +162,8 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
      this.findPreference(PREFERENCE_CATEGORY_HELP)
          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_HELP));

-      DcHelper.getEventCenter(getActivity()).addObserver(DcContext.DC_EVENT_CONNECTIVITY_CHANGED, this);
+      DcHelper.getEventCenter(getActivity())
+          .addObserver(DcContext.DC_EVENT_CONNECTIVITY_CHANGED, this);
    }

    @Override
@@ -172,7 +175,9 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
    public void onResume() {
      super.onResume();
      //noinspection ConstantConditions
-      ((ApplicationPreferencesActivity) getActivity()).getSupportActionBar().setTitle(R.string.menu_settings);
+      ((ApplicationPreferencesActivity) getActivity())
+          .getSupportActionBar()
+          .setTitle(R.string.menu_settings);
      setCategorySummaries();
    }

@@ -186,12 +191,14 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
    public void handleEvent(@NonNull DcEvent event) {
      if (event.getId() == DcContext.DC_EVENT_CONNECTIVITY_CHANGED) {
        this.findPreference(PREFERENCE_CATEGORY_CONNECTIVITY)
-                .setSummary(DcHelper.getConnectivitySummary(getActivity(), getString(R.string.connectivity_connected)));
+            .setSummary(
+                DcHelper.getConnectivitySummary(
+                    getActivity(), getString(R.string.connectivity_connected)));
      }
    }

    private void setCategorySummaries() {
-      ((ProfilePreference)this.findPreference(PREFERENCE_CATEGORY_PROFILE)).refresh();
+      ((ProfilePreference) this.findPreference(PREFERENCE_CATEGORY_PROFILE)).refresh();

      this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS)
          .setSummary(NotificationsPreferenceFragment.getSummary(getActivity()));
@@ -202,7 +209,9 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
      this.findPreference(PREFERENCE_CATEGORY_PRIVACY)
          .setSummary(PrivacyPreferenceFragment.getSummary(getActivity()));
      this.findPreference(PREFERENCE_CATEGORY_CONNECTIVITY)
-          .setSummary(DcHelper.getConnectivitySummary(getActivity(), getString(R.string.connectivity_connected)));
+          .setSummary(
+              DcHelper.getConnectivitySummary(
+                  getActivity(), getString(R.string.connectivity_connected)));
      this.findPreference(PREFERENCE_CATEGORY_HELP)
          .setSummary(AdvancedPreferenceFragment.getVersion(getActivity()));
    }
@@ -219,63 +228,76 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
        Fragment fragment = null;

        switch (category) {
-        case PREFERENCE_CATEGORY_NOTIFICATIONS:
-          NotificationManagerCompat notificationManager = NotificationManagerCompat.from(getActivity());
-          if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU || notificationManager.areNotificationsEnabled()) {
-            fragment = new NotificationsPreferenceFragment();
-          } else {
-            new AlertDialog.Builder(getActivity())
-              .setTitle(R.string.notifications_disabled)
-              .setMessage(R.string.perm_explain_access_to_notifications_denied)
-              .setPositiveButton(R.string.perm_continue, (dialog, which) -> getActivity().startActivity(Permissions.getApplicationSettingsIntent(getActivity())))
-              .setNegativeButton(android.R.string.cancel, null)
-              .show();
-          }
-          break;
-        case PREFERENCE_CATEGORY_CONNECTIVITY:
-          startActivity(new Intent(getActivity(), ConnectivityActivity.class));
-          break;
-        case PREFERENCE_CATEGORY_APPEARANCE:
-          fragment = new AppearancePreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_CHATS:
-          fragment = new ChatsPreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_PRIVACY:
-          fragment = new PrivacyPreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_MULTIDEVICE:
-          if (!ScreenLockUtil.applyScreenLock(getActivity(), getString(R.string.multidevice_title),
-              getString(R.string.multidevice_this_creates_a_qr_code) + "\n\n" + getString(R.string.enter_system_secret_to_continue),
-              ScreenLockUtil.REQUEST_CODE_CONFIRM_CREDENTIALS)) {
-            new AlertDialog.Builder(getActivity())
-              .setTitle(R.string.multidevice_title)
-              .setMessage(R.string.multidevice_this_creates_a_qr_code)
-              .setPositiveButton(R.string.perm_continue,
-                (dialog, which) -> ((ApplicationPreferencesActivity)getActivity()).showBackupProvider())
-              .setNegativeButton(R.string.cancel, null)
-              .show();
-            ;
-          }
-          break;
-        case PREFERENCE_CATEGORY_ADVANCED:
-          fragment = new AdvancedPreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_DONATE:
-          IntentUtils.showInBrowser(requireActivity(), "https://arcanechat.me/#contribute");
-          break;
-        case PREFERENCE_CATEGORY_HELP:
-          startActivity(new Intent(getActivity(), LocalHelpActivity.class));
-          break;
-        default:
-          throw new AssertionError();
+          case PREFERENCE_CATEGORY_NOTIFICATIONS:
+            NotificationManagerCompat notificationManager =
+                NotificationManagerCompat.from(getActivity());
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU
+                || notificationManager.areNotificationsEnabled()) {
+              fragment = new NotificationsPreferenceFragment();
+            } else {
+              new AlertDialog.Builder(getActivity())
+                  .setTitle(R.string.notifications_disabled)
+                  .setMessage(R.string.perm_explain_access_to_notifications_denied)
+                  .setPositiveButton(
+                      R.string.perm_continue,
+                      (dialog, which) ->
+                          getActivity()
+                              .startActivity(
+                                  Permissions.getApplicationSettingsIntent(getActivity())))
+                  .setNegativeButton(android.R.string.cancel, null)
+                  .show();
+            }
+            break;
+          case PREFERENCE_CATEGORY_CONNECTIVITY:
+            startActivity(new Intent(getActivity(), ConnectivityActivity.class));
+            break;
+          case PREFERENCE_CATEGORY_APPEARANCE:
+            fragment = new AppearancePreferenceFragment();
+            break;
+          case PREFERENCE_CATEGORY_CHATS:
+            fragment = new ChatsPreferenceFragment();
+            break;
+          case PREFERENCE_CATEGORY_PRIVACY:
+            fragment = new PrivacyPreferenceFragment();
+            break;
+          case PREFERENCE_CATEGORY_MULTIDEVICE:
+            if (!ScreenLockUtil.applyScreenLock(
+                getActivity(),
+                getString(R.string.multidevice_title),
+                getString(R.string.multidevice_this_creates_a_qr_code)
+                    + "\n\n"
+                    + getString(R.string.enter_system_secret_to_continue),
+                screenLockLauncher)) {
+              new AlertDialog.Builder(getActivity())
+                  .setTitle(R.string.multidevice_title)
+                  .setMessage(R.string.multidevice_this_creates_a_qr_code)
+                  .setPositiveButton(
+                      R.string.perm_continue,
+                      (dialog, which) ->
+                          ((ApplicationPreferencesActivity) getActivity()).showBackupProvider())
+                  .setNegativeButton(R.string.cancel, null)
+                  .show();
+              ;
+            }
+            break;
+          case PREFERENCE_CATEGORY_ADVANCED:
+            fragment = new AdvancedPreferenceFragment();
+            break;
+          case PREFERENCE_CATEGORY_DONATE:
+            IntentUtils.showInBrowser(requireActivity(), "https://arcanechat.me/#contribute");
+            break;
+          case PREFERENCE_CATEGORY_HELP:
+            startActivity(new Intent(getActivity(), LocalHelpActivity.class));
+            break;
+          default:
+            throw new AssertionError();
        }

        if (fragment != null) {
          Bundle args = new Bundle();
          fragment.setArguments(args);

-          FragmentManager     fragmentManager     = getActivity().getSupportFragmentManager();
+          FragmentManager fragmentManager = getActivity().getSupportFragmentManager();
          FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
          fragmentTransaction.replace(R.id.fragment, fragment);
          fragmentTransaction.addToBackStack(null);
@@ -297,7 +319,8 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
  }

  @Override
-  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+  public void onRequestPermissionsResult(
+      int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
  }
 }
@@ -2,8 +2,6 @@ package org.thoughtcrime.securesms;

 import android.content.Intent;

-import org.thoughtcrime.securesms.connect.DcHelper;
-
 public class AttachContactActivity extends ContactSelectionActivity {

  public static final String CONTACT_ID_EXTRA = "contact_id_extra";
@@ -1,13 +1,11 @@
 package org.thoughtcrime.securesms;

-import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.ViewConfiguration;
 import android.view.WindowManager;
-
 import androidx.activity.EdgeToEdge;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
@@ -15,14 +13,11 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.view.WindowCompat;
 import androidx.fragment.app.Fragment;
-
+import java.lang.reflect.Field;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.ViewUtil;

-import java.lang.reflect.Field;
-
-
 public abstract class BaseActionBarActivity extends AppCompatActivity {

  private static final String TAG = BaseActionBarActivity.class.getSimpleName();
@@ -40,11 +35,13 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
    // Only enable Edge-to-Edge if it is well supported
    if (ViewUtil.isEdgeToEdgeSupported()) {
      // docs says to use: WindowCompat.enableEdgeToEdge(getWindow());
-      // but it actually makes things worse, the next takes care of setting the 3-buttons navigation bar background
+      // but it actually makes things worse, the next takes care of setting the 3-buttons navigation
+      // bar background
      EdgeToEdge.enable(this);

      // force white text in status bar so it visible over background color
-      WindowCompat.getInsetsController(getWindow(), getWindow().getDecorView()).setAppearanceLightStatusBars(false);
+      WindowCompat.getInsetsController(getWindow(), getWindow().getDecorView())
+          .setAppearanceLightStatusBars(false);
    }
  }

@@ -68,14 +65,12 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
    }
  }

-  /**
-   * Modified from: http://stackoverflow.com/a/13098824
-   */
+  /** Modified from: http://stackoverflow.com/a/13098824 */
  private void forceOverflowMenu() {
    try {
-      ViewConfiguration config       = ViewConfiguration.get(this);
-      Field             menuKeyField = ViewConfiguration.class.getDeclaredField("sHasPermanentMenuKey");
-      if(menuKeyField != null) {
+      ViewConfiguration config = ViewConfiguration.get(this);
+      Field menuKeyField = ViewConfiguration.class.getDeclaredField("sHasPermanentMenuKey");
+      if (menuKeyField != null) {
        menuKeyField.setAccessible(true);
        menuKeyField.setBoolean(config, false);
      }
@@ -86,32 +81,24 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
    }
  }

-  public void makeSearchMenuVisible(final Menu menu, final MenuItem searchItem, boolean visible) {
+  public void makeSearchMenuVisible(final Menu menu, final MenuItem searchItem) {
    for (int i = 0; i < menu.size(); ++i) {
      MenuItem item = menu.getItem(i);
      int id = item.getItemId();
      if (id == R.id.menu_search_up || id == R.id.menu_search_down) {
-        item.setVisible(visible);
-      } else if (id == R.id.menu_search_counter) {
-        item.setVisible(false); // always hide menu_search_counter initially
-      } else if (item == searchItem) {
-        ; // searchItem is just always visible
-      } else {
-        item.setVisible(!visible); // if search is shown, other items are hidden - and the other way round
+        item.setVisible(true);
+      } else if (item != searchItem) {
+        item.setVisible(false); // hide all other items
      }
    }
  }

-  protected <T extends Fragment> T initFragment(@IdRes int target,
-                                                @NonNull T fragment)
-  {
+  protected <T extends Fragment> T initFragment(@IdRes int target, @NonNull T fragment) {
    return initFragment(target, fragment, null);
  }

-  protected <T extends Fragment> T initFragment(@IdRes int target,
-                                                @NonNull T fragment,
-                                                @Nullable Bundle extras)
-  {
+  protected <T extends Fragment> T initFragment(
+      @IdRes int target, @NonNull T fragment, @Nullable Bundle extras) {
    Bundle args = new Bundle();

    if (extras != null) {
@@ -119,9 +106,10 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
    }

    fragment.setArguments(args);
-    getSupportFragmentManager().beginTransaction()
-      .replace(target, fragment)
-      .commitAllowingStateLoss();
+    getSupportFragmentManager()
+        .beginTransaction()
+        .replace(target, fragment)
+        .commitAllowingStateLoss();
    return fragment;
  }
 }
@@ -6,42 +6,37 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-
+import chat.delta.rpc.Rpc;
 import com.b44t.messenger.DcChat;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcMsg;
-
+import java.util.HashSet;
+import java.util.Set;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;

-import java.util.HashSet;
-import java.util.Set;
-
-import chat.delta.rpc.Rpc;
-
 public abstract class BaseConversationItem extends LinearLayout
-    implements BindableConversationItem
-{
+    implements BindableConversationItem {
  static final long PULSE_HIGHLIGHT_MILLIS = 500;

-  protected DcMsg         messageRecord;
-  protected DcChat        dcChat;
-  protected TextView      bodyText;
+  protected DcMsg messageRecord;
+  protected DcChat dcChat;
+  protected TextView bodyText;

-  protected final Context              context;
-  protected final DcContext            dcContext;
+  protected final Context context;
+  protected final DcContext dcContext;
  protected final Rpc rpc;
-  protected Recipient                  conversationRecipient;
+  protected Recipient conversationRecipient;

-  protected @NonNull  Set<DcMsg> batchSelected = new HashSet<>();
+  protected @NonNull Set<DcMsg> batchSelected = new HashSet<>();

-  protected final PassthroughClickListener passthroughClickListener = new PassthroughClickListener();
+  protected final PassthroughClickListener passthroughClickListener =
+      new PassthroughClickListener();

  public BaseConversationItem(Context context, AttributeSet attrs) {
    super(context, attrs);
@@ -50,32 +45,32 @@ public abstract class BaseConversationItem extends LinearLayout
    this.rpc = DcHelper.getRpc(context);
  }

-  protected void bind(@NonNull DcMsg            messageRecord,
-                      @NonNull DcChat           dcChat,
-                      @NonNull Set<DcMsg>       batchSelected,
-                      boolean                   pulseHighlight,
-                      @NonNull Recipient        conversationRecipient)
-  {
-    this.messageRecord  = messageRecord;
-    this.dcChat         = dcChat;
-    this.batchSelected  = batchSelected;
-    this.conversationRecipient  = conversationRecipient;
+  protected void bindPartial(
+      @NonNull DcMsg messageRecord,
+      @NonNull DcChat dcChat,
+      @NonNull Set<DcMsg> batchSelected,
+      boolean pulseHighlight,
+      @NonNull Recipient conversationRecipient) {
+    this.messageRecord = messageRecord;
+    this.dcChat = dcChat;
+    this.batchSelected = batchSelected;
+    this.conversationRecipient = conversationRecipient;
    setInteractionState(messageRecord, pulseHighlight);
  }

  protected void setInteractionState(DcMsg messageRecord, boolean pulseHighlight) {
-    final int[] attributes = new int[] {
-        R.attr.conversation_item_background,
-        R.attr.conversation_item_background_animated,
-    };
+    final int[] attributes =
+        new int[] {
+          R.attr.conversation_item_background, R.attr.conversation_item_background_animated,
+        };

    if (batchSelected.contains(messageRecord)) {
-     final TypedArray attrs = context.obtainStyledAttributes(attributes);
+      final TypedArray attrs = context.obtainStyledAttributes(attributes);
      ViewUtil.setBackground(this, attrs.getDrawable(0));
      attrs.recycle();
      setSelected(true);
    } else if (pulseHighlight) {
-     final TypedArray attrs = context.obtainStyledAttributes(attributes);
+      final TypedArray attrs = context.obtainStyledAttributes(attributes);
      ViewUtil.setBackground(this, attrs.getDrawable(1));
      attrs.recycle();
      setSelected(true);
@@ -92,15 +87,16 @@ public abstract class BaseConversationItem extends LinearLayout

  protected boolean shouldInterceptClicks(DcMsg messageRecord) {
    return batchSelected.isEmpty()
-            && (messageRecord.isFailed()
-                || messageRecord.getInfoType() == DcMsg.DC_INFO_CHAT_E2EE
-                || messageRecord.getInfoType() == DcMsg.DC_INFO_PROTECTION_ENABLED
-                || messageRecord.getInfoType() == DcMsg.DC_INFO_INVALID_UNENCRYPTED_MAIL);
+        && (messageRecord.isFailed()
+            || messageRecord.getInfoType() == DcMsg.DC_INFO_CHAT_E2EE
+            || messageRecord.getInfoType() == DcMsg.DC_INFO_PROTECTION_ENABLED
+            || messageRecord.getInfoType() == DcMsg.DC_INFO_INVALID_UNENCRYPTED_MAIL);
  }

  protected void onAccessibilityClick() {}

-  protected class PassthroughClickListener implements View.OnLongClickListener, View.OnClickListener {
+  protected class PassthroughClickListener
+      implements View.OnLongClickListener, View.OnClickListener {

    @Override
    public boolean onLongClick(View v) {
@@ -126,6 +122,8 @@ public abstract class BaseConversationItem extends LinearLayout

    public void onClick(View v) {
      if (!shouldInterceptClicks(messageRecord) && parent != null) {
+        // The click workaround on ConversationItem shall be revised.
+        // In fact, it is probably better rethinking accessibility approach for the items.
        if (batchSelected.isEmpty() && Util.isTouchExplorationEnabled(context)) {
          BaseConversationItem.this.onAccessibilityClick();
        }
@@ -135,13 +133,15 @@ public abstract class BaseConversationItem extends LinearLayout
        TextView detailsText = view.findViewById(R.id.details_text);
        detailsText.setText(messageRecord.getError());

-        AlertDialog d = new AlertDialog.Builder(context)
+        AlertDialog d =
+            new AlertDialog.Builder(context)
                .setView(view)
                .setTitle(R.string.error)
                .setPositiveButton(R.string.ok, null)
                .create();
        d.show();
-      } else if (messageRecord.getInfoType() == DcMsg.DC_INFO_CHAT_E2EE || messageRecord.getInfoType() == DcMsg.DC_INFO_PROTECTION_ENABLED) {
+      } else if (messageRecord.getInfoType() == DcMsg.DC_INFO_CHAT_E2EE
+          || messageRecord.getInfoType() == DcMsg.DC_INFO_PROTECTION_ENABLED) {
        DcHelper.showProtectionEnabledDialog(context);
      } else if (messageRecord.getInfoType() == DcMsg.DC_INFO_INVALID_UNENCRYPTED_MAIL) {
        DcHelper.showInvalidUnencryptedDialog(context);
@@ -1,14 +1,14 @@
 package org.thoughtcrime.securesms;

 import androidx.recyclerview.widget.RecyclerView;
-
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;

-public abstract class BaseConversationListAdapter<T extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<T> {
-  protected final Set<Long> batchSet  = Collections.synchronizedSet(new HashSet<Long>());
-  protected       boolean   batchMode = false;
+public abstract class BaseConversationListAdapter<T extends RecyclerView.ViewHolder>
+    extends RecyclerView.Adapter<T> {
+  protected final Set<Long> batchSet = Collections.synchronizedSet(new HashSet<Long>());
+  protected boolean batchMode = false;

  public abstract void selectAllThreads();

@@ -17,7 +17,6 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.Toast;
-
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
@@ -27,36 +26,36 @@ import androidx.core.content.pm.ShortcutInfoCompat;
 import androidx.core.content.pm.ShortcutManagerCompat;
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.fragment.app.Fragment;
-
 import com.b44t.messenger.DcChat;
+import com.b44t.messenger.DcContact;
 import com.b44t.messenger.DcContext;
 import com.google.android.material.snackbar.Snackbar;
-
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
 import org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.connect.DirectShareUtil;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.ShareUtil;
 import org.thoughtcrime.securesms.util.SendRelayedMessageUtil;
+import org.thoughtcrime.securesms.util.ShareUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.task.SnackbarAsyncTask;
 import org.thoughtcrime.securesms.util.views.ProgressDialog;

-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-
 public abstract class BaseConversationListFragment extends Fragment implements ActionMode.Callback {
  protected ActionMode actionMode;
  protected PulsingFloatingActionButton fab;

  protected abstract boolean offerToArchive();
+
  protected abstract void setFabVisibility(boolean isActionMode);
+
  protected abstract BaseConversationListAdapter getListAdapter();

  protected void onItemClick(long chatId) {
    if (actionMode == null) {
-      ((ConversationSelectedListener) requireActivity()).onCreateConversation((int)chatId);
+      ((ConversationSelectedListener) requireActivity()).onCreateConversation((int) chatId);
    } else {
      BaseConversationListAdapter adapter = getListAdapter();
      adapter.toggleThreadInBatchSet(chatId);
@@ -71,8 +70,9 @@ public abstract class BaseConversationListFragment extends Fragment implements A
      adapter.notifyDataSetChanged();
    }
  }
+
  public void onItemLongClick(long chatId) {
-    actionMode = ((AppCompatActivity)requireActivity()).startSupportActionMode(this);
+    actionMode = ((AppCompatActivity) requireActivity()).startSupportActionMode(this);

    if (actionMode != null) {
      getListAdapter().initializeBatchMode(true);
@@ -89,36 +89,54 @@ public abstract class BaseConversationListFragment extends Fragment implements A
    Intent intent = new Intent(getActivity(), NewConversationActivity.class);
    if (isRelayingMessageContent(getActivity())) {
      if (isActionMode) {
-        fab.setOnClickListener(v -> {
-          final Set<Long> selectedChats = getListAdapter().getBatchSelections();
-          ArrayList<Uri> uris = getSharedUris(getActivity());
-          String message;
-          if (isForwarding(getActivity())) {
-            message = String.format(Util.getLocale(), getString(R.string.ask_forward_multiple), selectedChats.size());
-          } else if (!uris.isEmpty()) {
-            message = String.format(Util.getLocale(), getString(R.string.ask_send_files_to_selected_chats), uris.size(), selectedChats.size());
-          } else {
-            message = String.format(Util.getLocale(), getString(R.string.share_text_multiple_chats), selectedChats.size(), getSharedText(getActivity()));
-          }
+        fab.setOnClickListener(
+            v -> {
+              final Set<Long> selectedChats = getListAdapter().getBatchSelections();
+              ArrayList<Uri> uris = getSharedUris(getActivity());
+              String message;
+              if (isForwarding(getActivity())) {
+                message =
+                    String.format(
+                        Util.getLocale(),
+                        getString(R.string.ask_forward_multiple),
+                        selectedChats.size());
+              } else if (!uris.isEmpty()) {
+                message =
+                    String.format(
+                        Util.getLocale(),
+                        getString(R.string.ask_send_files_to_selected_chats),
+                        uris.size(),
+                        selectedChats.size());
+              } else {
+                message =
+                    String.format(
+                        Util.getLocale(),
+                        getString(R.string.share_text_multiple_chats),
+                        selectedChats.size(),
+                        getSharedText(getActivity()));
+              }

-          Context context = getContext();
-          if (context != null) {
-            if (SendRelayedMessageUtil.containsVideoType(context, uris)) {
-              message += "\n\n" + getString(R.string.videos_sent_without_recoding);
-            }
-            new AlertDialog.Builder(context)
+              Context context = getContext();
+              if (context != null) {
+                if (SendRelayedMessageUtil.containsVideoType(context, uris)) {
+                  message += "\n\n" + getString(R.string.videos_sent_without_recoding);
+                }
+                new AlertDialog.Builder(context)
                    .setMessage(message)
                    .setCancelable(false)
                    .setNegativeButton(android.R.string.cancel, ((dialog, which) -> {}))
-                    .setPositiveButton(R.string.menu_send, (dialog, which) -> {
-                      SendRelayedMessageUtil.immediatelyRelay(getActivity(), selectedChats.toArray(new Long[selectedChats.size()]));
-                      actionMode.finish();
-                      actionMode = null;
-                      getActivity().finish();
-                    })
+                    .setPositiveButton(
+                        R.string.menu_send,
+                        (dialog, which) -> {
+                          SendRelayedMessageUtil.immediatelyRelay(
+                              getActivity(), selectedChats.toArray(new Long[selectedChats.size()]));
+                          actionMode.finish();
+                          actionMode = null;
+                          getActivity().finish();
+                        })
                    .show();
-          }
-        });
+              }
+            });
      } else {
        acquireRelayMessageContent(getActivity(), intent);
        fab.setOnClickListener(v -> requireActivity().startActivity(intent));
@@ -132,8 +150,8 @@ public abstract class BaseConversationListFragment extends Fragment implements A
    DcContext dcContext = DcHelper.getContext(requireActivity());
    final Set<Long> selectedChats = getListAdapter().getBatchSelections();
    for (long chatId : selectedChats) {
-      DcChat dcChat = dcContext.getChat((int)chatId);
-      if (dcChat.getVisibility()!=DcChat.DC_CHAT_VISIBILITY_PINNED) {
+      DcChat dcChat = dcContext.getChat((int) chatId);
+      if (dcChat.getVisibility() != DcChat.DC_CHAT_VISIBILITY_PINNED) {
        return true;
      }
    }
@@ -144,7 +162,7 @@ public abstract class BaseConversationListFragment extends Fragment implements A
    DcContext dcContext = DcHelper.getContext(requireActivity());
    final Set<Long> selectedChats = getListAdapter().getBatchSelections();
    for (long chatId : selectedChats) {
-      DcChat dcChat = dcContext.getChat((int)chatId);
+      DcChat dcChat = dcContext.getChat((int) chatId);
      if (!dcChat.isMuted()) {
        return true;
      }
@@ -153,12 +171,14 @@ public abstract class BaseConversationListFragment extends Fragment implements A
  }

  private void handlePinAllSelected() {
-    final DcContext dcContext             = DcHelper.getContext(requireActivity());
-    final Set<Long> selectedConversations = new HashSet<Long>(getListAdapter().getBatchSelections());
+    final DcContext dcContext = DcHelper.getContext(requireActivity());
+    final Set<Long> selectedConversations =
+        new HashSet<Long>(getListAdapter().getBatchSelections());
    boolean doPin = areSomeSelectedChatsUnpinned();
    for (long chatId : selectedConversations) {
-      dcContext.setChatVisibility((int)chatId,
-              doPin? DcChat.DC_CHAT_VISIBILITY_PINNED : DcChat.DC_CHAT_VISIBILITY_NORMAL);
+      dcContext.setChatVisibility(
+          (int) chatId,
+          doPin ? DcChat.DC_CHAT_VISIBILITY_PINNED : DcChat.DC_CHAT_VISIBILITY_NORMAL);
    }
    if (actionMode != null) {
      actionMode.finish();
@@ -167,23 +187,26 @@ public abstract class BaseConversationListFragment extends Fragment implements A
  }

  private void handleMuteAllSelected() {
-    final DcContext dcContext             = DcHelper.getContext(requireActivity());
-    final Set<Long> selectedConversations = new HashSet<Long>(getListAdapter().getBatchSelections());
+    final DcContext dcContext = DcHelper.getContext(requireActivity());
+    final Set<Long> selectedConversations =
+        new HashSet<Long>(getListAdapter().getBatchSelections());
    if (areSomeSelectedChatsUnmuted()) {
-      MuteDialog.show(getActivity(), duration -> {
-          for (long chatId : selectedConversations) {
-            dcContext.setChatMuteDuration((int)chatId, duration);
-          }
+      MuteDialog.show(
+          getActivity(),
+          duration -> {
+            for (long chatId : selectedConversations) {
+              dcContext.setChatMuteDuration((int) chatId, duration);
+            }

-          if (actionMode != null) {
-            actionMode.finish();
-            actionMode = null;
-          }
-      });
+            if (actionMode != null) {
+              actionMode.finish();
+              actionMode = null;
+            }
+          });
    } else {
      // unmute
      for (long chatId : selectedConversations) {
-        dcContext.setChatMuteDuration((int)chatId, 0);
+        dcContext.setChatMuteDuration((int) chatId, 0);
      }

      if (actionMode != null) {
@@ -194,10 +217,11 @@ public abstract class BaseConversationListFragment extends Fragment implements A
  }

  private void handleMarknoticedSelected() {
-    final DcContext dcContext             = DcHelper.getContext(requireActivity());
-    final Set<Long> selectedConversations = new HashSet<Long>(getListAdapter().getBatchSelections());
+    final DcContext dcContext = DcHelper.getContext(requireActivity());
+    final Set<Long> selectedConversations =
+        new HashSet<Long>(getListAdapter().getBatchSelections());
    for (long chatId : selectedConversations) {
-      dcContext.marknoticedChat((int)chatId);
+      dcContext.marknoticedChat((int) chatId);
    }
    if (actionMode != null) {
      actionMode.finish();
@@ -207,22 +231,21 @@ public abstract class BaseConversationListFragment extends Fragment implements A

  @SuppressLint("StaticFieldLeak")
  private void handleArchiveAllSelected() {
-    final DcContext dcContext             = DcHelper.getContext(requireActivity());
-    final Set<Long> selectedConversations = new HashSet<Long>(getListAdapter().getBatchSelections());
-    final boolean   archive               = offerToArchive();
+    final DcContext dcContext = DcHelper.getContext(requireActivity());
+    final Set<Long> selectedConversations =
+        new HashSet<Long>(getListAdapter().getBatchSelections());
+    final boolean archive = offerToArchive();

    int snackBarTitleId;

    if (archive) snackBarTitleId = R.plurals.chat_archived;
-    else         snackBarTitleId = R.plurals.chat_unarchived;
+    else snackBarTitleId = R.plurals.chat_unarchived;

-    int count            = selectedConversations.size();
+    int count = selectedConversations.size();
    String snackBarTitle = getResources().getQuantityString(snackBarTitleId, count, count);

-    new SnackbarAsyncTask<Void>(getView(), snackBarTitle,
-                                getString(R.string.undo),
-                                Snackbar.LENGTH_LONG, true)
-    {
+    new SnackbarAsyncTask<Void>(
+        getView(), snackBarTitle, getString(R.string.undo), Snackbar.LENGTH_LONG, true) {

      @Override
      protected void onPostExecute(Void result) {
@@ -237,16 +260,18 @@ public abstract class BaseConversationListFragment extends Fragment implements A
      @Override
      protected void executeAction(@Nullable Void parameter) {
        for (long chatId : selectedConversations) {
-          dcContext.setChatVisibility((int)chatId,
-                  archive? DcChat.DC_CHAT_VISIBILITY_ARCHIVED : DcChat.DC_CHAT_VISIBILITY_NORMAL);
+          dcContext.setChatVisibility(
+              (int) chatId,
+              archive ? DcChat.DC_CHAT_VISIBILITY_ARCHIVED : DcChat.DC_CHAT_VISIBILITY_NORMAL);
        }
      }

      @Override
      protected void reverseAction(@Nullable Void parameter) {
        for (long threadId : selectedConversations) {
-          dcContext.setChatVisibility((int)threadId,
-                  archive? DcChat.DC_CHAT_VISIBILITY_NORMAL : DcChat.DC_CHAT_VISIBILITY_ARCHIVED);
+          dcContext.setChatVisibility(
+              (int) threadId,
+              archive ? DcChat.DC_CHAT_VISIBILITY_NORMAL : DcChat.DC_CHAT_VISIBILITY_ARCHIVED);
        }
      }
    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -262,51 +287,73 @@ public abstract class BaseConversationListFragment extends Fragment implements A
    final String alertText;
    if (chatsCount == 1) {
      long chatId = selectedChats.iterator().next();
-      alertText = activity.getResources().getString(R.string.ask_delete_named_chat, dcContext.getChat((int)chatId).getName());
+      alertText =
+          activity
+              .getResources()
+              .getString(R.string.ask_delete_named_chat, dcContext.getChat((int) chatId).getName());
    } else {
-      alertText = activity.getResources().getQuantityString(R.plurals.ask_delete_chat, chatsCount, chatsCount);
+      alertText =
+          activity
+              .getResources()
+              .getQuantityString(R.plurals.ask_delete_chat, chatsCount, chatsCount);
+    }
+
+    String alertButton = getString(R.string.delete_for_me);
+    for (long chatId : selectedChats) {
+      if (dcContext.getChat((int) chatId).shallLeaveBeforeDelete(dcContext)) {
+        alertButton = getString(R.string.menu_leave_and_delete);
+        break;
+      }
    }

    AlertDialog.Builder alert = new AlertDialog.Builder(activity);
    alert.setMessage(alertText);
    alert.setCancelable(true);

-    alert.setPositiveButton(R.string.delete, (dialog, which) -> {
+    alert.setPositiveButton(
+        alertButton,
+        (dialog, which) -> {
+          if (!selectedChats.isEmpty()) {
+            new AsyncTask<Void, Void, Void>() {
+              private ProgressDialog dialog;

-      if (!selectedChats.isEmpty()) {
-        new AsyncTask<Void, Void, Void>() {
-          private ProgressDialog dialog;
+              @Override
+              protected void onPreExecute() {
+                dialog =
+                    ProgressDialog.show(
+                        getActivity(),
+                        "",
+                        requireActivity().getString(R.string.one_moment),
+                        true,
+                        false);
+              }

-          @Override
-          protected void onPreExecute() {
-            dialog = ProgressDialog.show(getActivity(),
-                "",
-                requireActivity().getString(R.string.one_moment),
-                true, false);
+              @Override
+              protected Void doInBackground(Void... params) {
+                int accountId = dcContext.getAccountId();
+                for (long chatId : selectedChats) {
+                  DcHelper.getNotificationCenter(requireContext())
+                      .removeNotifications(accountId, (int) chatId);
+                  if (dcContext.getChat((int) chatId).shallLeaveBeforeDelete(dcContext)) {
+                    dcContext.removeContactFromChat((int) chatId, DcContact.DC_CONTACT_ID_SELF);
+                  }
+                  dcContext.deleteChat((int) chatId);
+                  DirectShareUtil.clearShortcut(requireContext(), (int) chatId);
+                }
+                return null;
+              }
+
+              @Override
+              protected void onPostExecute(Void result) {
+                dialog.dismiss();
+                if (actionMode != null) {
+                  actionMode.finish();
+                  actionMode = null;
+                }
+              }
+            }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
          }
-
-          @Override
-          protected Void doInBackground(Void... params) {
-            int accountId = dcContext.getAccountId();
-            for (long chatId : selectedChats) {
-              DcHelper.getNotificationCenter(requireContext()).removeNotifications(accountId, (int) chatId);
-              dcContext.deleteChat((int) chatId);
-              DirectShareUtil.clearShortcut(requireContext(), (int) chatId);
-            }
-            return null;
-          }
-
-          @Override
-          protected void onPostExecute(Void result) {
-            dialog.dismiss();
-            if (actionMode != null) {
-              actionMode.finish();
-              actionMode = null;
-            }
-          }
-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-      }
-    });
+        });

    alert.setNegativeButton(android.R.string.cancel, null);
    AlertDialog dialog = alert.show();
@@ -331,22 +378,30 @@ public abstract class BaseConversationListFragment extends Fragment implements A
    intent.putExtra(ShareActivity.EXTRA_CHAT_ID, chat.getId());

    Recipient recipient = new Recipient(activity, chat);
-    Util.runOnAnyBackgroundThread(() -> {
-      Bitmap avatar = DirectShareUtil.getIconForShortcut(activity, recipient);
-      ShortcutInfoCompat shortcutInfoCompat = new ShortcutInfoCompat.Builder(activity, "chat-" + dcContext.getAccountId() + "-" + chat.getId())
-        .setShortLabel(chat.getName())
-        .setIcon(IconCompat.createWithAdaptiveBitmap(avatar))
-        .setIntent(intent)
-        .build();
-      Util.runOnMain(() -> {
-        if (!ShortcutManagerCompat.requestPinShortcut(activity, shortcutInfoCompat, null)) {
-          Toast.makeText(activity, "ErrAddToHomescreen: requestPinShortcut() failed", Toast.LENGTH_LONG).show();
-        } else if (actionMode != null) {
-          actionMode.finish();
-          actionMode = null;
-        }
-      });
-    });
+    Util.runOnAnyBackgroundThread(
+        () -> {
+          Bitmap avatar = DirectShareUtil.getIconForShortcut(activity, recipient);
+          ShortcutInfoCompat shortcutInfoCompat =
+              new ShortcutInfoCompat.Builder(
+                      activity, "chat-" + dcContext.getAccountId() + "-" + chat.getId())
+                  .setShortLabel(chat.getName())
+                  .setIcon(IconCompat.createWithAdaptiveBitmap(avatar))
+                  .setIntent(intent)
+                  .build();
+          Util.runOnMain(
+              () -> {
+                if (!ShortcutManagerCompat.requestPinShortcut(activity, shortcutInfoCompat, null)) {
+                  Toast.makeText(
+                          activity,
+                          "ErrAddToHomescreen: requestPinShortcut() failed",
+                          Toast.LENGTH_LONG)
+                      .show();
+                } else if (actionMode != null) {
+                  actionMode.finish();
+                  actionMode = null;
+                }
+              });
+        });
  }

  private void updateActionModeItems(Menu menu) {
@@ -356,11 +411,11 @@ public abstract class BaseConversationListFragment extends Fragment implements A
      menu.findItem(R.id.menu_add_to_home_screen).setVisible(selectedCount == 1);
      MenuItem archiveItem = menu.findItem(R.id.menu_archive_selected);
      if (offerToArchive()) {
-          archiveItem.setIcon(R.drawable.ic_archive_white_24dp);
-          archiveItem.setTitle(R.string.menu_archive_chat);
+        archiveItem.setIcon(R.drawable.ic_archive_white_24dp);
+        archiveItem.setTitle(R.string.menu_archive_chat);
      } else {
-          archiveItem.setIcon(R.drawable.ic_unarchive_white_24dp);
-          archiveItem.setTitle(R.string.menu_unarchive_chat);
+        archiveItem.setIcon(R.drawable.ic_unarchive_white_24dp);
+        archiveItem.setTitle(R.string.menu_unarchive_chat);
      }
      MenuItem pinItem = menu.findItem(R.id.menu_pin_selected);
      if (areSomeSelectedChatsUnpinned()) {
@@ -383,7 +438,8 @@ public abstract class BaseConversationListFragment extends Fragment implements A
  public boolean onCreateActionMode(ActionMode mode, Menu menu) {
    if (isRelayingMessageContent(getActivity())) {
      if (ShareUtil.getSharedContactId(getActivity()) != 0) {
-        return false; // no sharing of a contact to multiple recipients at the same time, we can reconsider when that becomes a real-world need
+        return false; // no sharing of a contact to multiple recipients at the same time, we can
+        // reconsider when that becomes a real-world need
      }
      Context context = getContext();
      if (context != null) {
@@ -451,6 +507,7 @@ public abstract class BaseConversationListFragment extends Fragment implements A

  public interface ConversationSelectedListener {
    void onCreateConversation(int chatId);
+
    void onSwitchToArchive();
  }
 }
@@ -2,22 +2,24 @@ package org.thoughtcrime.securesms;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
 import com.b44t.messenger.DcChat;
 import com.b44t.messenger.DcMsg;
-
+import java.util.Set;
+import org.thoughtcrime.securesms.components.audioplay.AudioPlaybackViewModel;
+import org.thoughtcrime.securesms.components.audioplay.AudioView;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;

-import java.util.Set;
-
 public interface BindableConversationItem extends Unbindable {
-  void bind(@NonNull DcMsg                   messageRecord,
-            @NonNull DcChat                  dcChat,
-            @NonNull GlideRequests           glideRequests,
-            @NonNull Set<DcMsg>              batchSelected,
-            @NonNull Recipient               recipients,
-                     boolean                 pulseHighlight);
+  void bind(
+      @NonNull DcMsg messageRecord,
+      @NonNull DcChat dcChat,
+      @NonNull GlideRequests glideRequests,
+      @NonNull Set<DcMsg> batchSelected,
+      @NonNull Recipient recipients,
+      boolean pulseHighlight,
+      @Nullable AudioPlaybackViewModel playbackViewModel,
+      AudioView.OnActionListener audioPlayPauseListener);

  DcMsg getMessageRecord();

@@ -25,9 +27,15 @@ public interface BindableConversationItem extends Unbindable {

  interface EventListener {
    void onQuoteClicked(DcMsg messageRecord);
+
    void onJumpToOriginalClicked(DcMsg messageRecord);
+
    void onShowFullClicked(DcMsg messageRecord);
+
    void onDownloadClicked(DcMsg messageRecord);
+
    void onReactionClicked(DcMsg messageRecord);
+
+    void onStickerClicked(DcMsg messageRecord);
  }
 }
@@ -1,19 +1,18 @@
 package org.thoughtcrime.securesms;

 import androidx.annotation.NonNull;
-
 import com.b44t.messenger.DcLot;
-
+import java.util.Set;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.mms.GlideRequests;

-import java.util.Set;
-
 public interface BindableConversationListItem extends Unbindable {

-  public void bind(@NonNull ThreadRecord thread,
-                   int msgId,
-                   @NonNull DcLot dcSummary,
-                   @NonNull GlideRequests glideRequests,
-                   @NonNull Set<Long> selectedThreads, boolean batchMode);
+  public void bind(
+      @NonNull ThreadRecord thread,
+      int msgId,
+      @NonNull DcLot dcSummary,
+      @NonNull GlideRequests glideRequests,
+      @NonNull Set<Long> selectedThreads,
+      boolean batchMode);
 }
@@ -6,7 +6,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
@@ -14,10 +13,8 @@ import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEvent;
-
 import org.thoughtcrime.securesms.connect.DcContactsLoader;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
@@ -39,17 +36,18 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
  @Override
  public boolean onOptionsItemSelected(MenuItem item) {
    switch (item.getItemId()) {
-      case android.R.id.home: finish(); return true;
+      case android.R.id.home:
+        finish();
+        return true;
    }

    return false;
  }

-  public static class BlockedAndShareContactsFragment
-          extends Fragment
-          implements LoaderManager.LoaderCallbacks<DcContactsLoader.Ret>,
-          DcEventCenter.DcEventDelegate, ContactSelectionListAdapter.ItemClickListener {
-
+  public static class BlockedAndShareContactsFragment extends Fragment
+      implements LoaderManager.LoaderCallbacks<DcContactsLoader.Ret>,
+          DcEventCenter.DcEventDelegate,
+          ContactSelectionListAdapter.ItemClickListener {

    private RecyclerView recyclerView;
    private TextView emptyStateView;
@@ -57,7 +55,7 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
      View view = inflater.inflate(R.layout.contact_selection_list_fragment, container, false);
-      recyclerView  = ViewUtil.findById(view, R.id.recycler_view);
+      recyclerView = ViewUtil.findById(view, R.id.recycler_view);
      recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));

      // add padding to avoid content hidden behind system bars
@@ -81,11 +79,8 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
    }

    private void initializeAdapter() {
-      ContactSelectionListAdapter adapter = new ContactSelectionListAdapter(getActivity(),
-              GlideApp.with(this),
-              this,
-              false,
-              false);
+      ContactSelectionListAdapter adapter =
+          new ContactSelectionListAdapter(getActivity(), GlideApp.with(this), this, false, false);
      recyclerView.setAdapter(adapter);
    }

@@ -112,7 +107,7 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity

    @Override
    public void handleEvent(@NonNull DcEvent event) {
-      if (event.getId()==DcContext.DC_EVENT_CONTACTS_CHANGED) {
+      if (event.getId() == DcContext.DC_EVENT_CONTACTS_CHANGED) {
        restartLoader();
      }
    }
@@ -128,10 +123,12 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
    @Override
    public void onItemClick(ContactSelectionListItem item, boolean handleActionMode) {
      new AlertDialog.Builder(getActivity())
-              .setMessage(R.string.ask_unblock_contact)
-              .setCancelable(true)
-              .setNegativeButton(android.R.string.cancel, null)
-              .setPositiveButton(R.string.menu_unblock_contact, (dialog, which) -> unblockContact(item.getContactId())).show();
+          .setMessage(R.string.ask_unblock_contact)
+          .setCancelable(true)
+          .setNegativeButton(android.R.string.cancel, null)
+          .setPositiveButton(
+              R.string.menu_unblock_contact, (dialog, which) -> unblockContact(item.getContactId()))
+          .show();
    }

    private void unblockContact(int contactId) {
@@ -143,5 +140,4 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
    @Override
    public void onItemLongClick(ContactSelectionListItem view) {}
  }
-
 }
@@ -2,12 +2,9 @@ package org.thoughtcrime.securesms;

 import android.os.Bundle;
 import android.view.Menu;
-
 import androidx.annotation.NonNull;
-
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEvent;
-
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;

@@ -35,8 +32,10 @@ public class ConnectivityActivity extends WebViewActivity implements DcEventCent
  }

  private void refresh() {
-    final String connectivityHtml = DcHelper.getContext(this).getConnectivityHtml()
-                                      .replace("</style>", " html { color-scheme: dark light; }</style>");
+    final String connectivityHtml =
+        DcHelper.getContext(this)
+            .getConnectivityHtml()
+            .replace("</style>", " html { color-scheme: dark light; }</style>");
    webView.loadDataWithBaseURL(null, connectivityHtml, "text/html", "utf-8", null);
  }

@@ -21,7 +21,6 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-
 import java.util.ArrayList;
 import java.util.List;

@@ -29,11 +28,11 @@ import java.util.List;
 * Activity container for selecting a list of contacts.
 *
 * @author Moxie Marlinspike
- *
 */
 public class ContactMultiSelectionActivity extends ContactSelectionActivity {

  public static final String CONTACTS_EXTRA = "contacts_extra";
+  public static final String DESELECTED_CONTACTS_EXTRA = "deselected_contacts_extra";

  @Override
  protected void onCreate(Bundle icicle, boolean ready) {
@@ -71,7 +70,10 @@ public class ContactMultiSelectionActivity extends ContactSelectionActivity {
  private void saveSelection() {
    Intent resultIntent = getIntent();
    List<Integer> selectedContacts = contactsFragment.getSelectedContacts();
+    List<Integer> deselectedContacts = contactsFragment.getDeselectedContacts();
    resultIntent.putIntegerArrayListExtra(CONTACTS_EXTRA, new ArrayList<>(selectedContacts));
+    resultIntent.putIntegerArrayListExtra(
+        DESELECTED_CONTACTS_EXTRA, new ArrayList<>(deselectedContacts));
    setResult(RESULT_OK, resultIntent);
  }
 }
@@ -18,7 +18,6 @@ package org.thoughtcrime.securesms;

 import android.os.Bundle;
 import android.view.MenuItem;
-
 import org.thoughtcrime.securesms.components.ContactFilterToolbar;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -27,11 +26,9 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 * Base activity container for selecting a list of contacts.
 *
 * @author Moxie Marlinspike
- *
 */
 public abstract class ContactSelectionActivity extends PassphraseRequiredActionBarActivity
-                                               implements ContactSelectionListFragment.OnContactSelectedListener
-{
+    implements ContactSelectionListFragment.OnContactSelectedListener {
  private static final String TAG = ContactSelectionActivity.class.getSimpleName();

  protected ContactSelectionListFragment contactsFragment;
@@ -61,7 +58,7 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
    this.toolbar = ViewUtil.findById(this, R.id.toolbar);
    setSupportActionBar(toolbar);

-    assert  getSupportActionBar() != null;
+    assert getSupportActionBar() != null;
    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
    getSupportActionBar().setDisplayShowTitleEnabled(false);
    getSupportActionBar().setIcon(null);
@@ -69,7 +66,9 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
  }

  private void initializeResources() {
-    contactsFragment = (ContactSelectionListFragment) getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
+    contactsFragment =
+        (ContactSelectionListFragment)
+            getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
    contactsFragment.setOnContactSelectedListener(this);
  }

@@ -16,7 +16,6 @@
 */
 package org.thoughtcrime.securesms;

-
 import static org.thoughtcrime.securesms.util.ShareUtil.isRelayingMessageContent;

 import android.app.Activity;
@@ -31,7 +30,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
@@ -41,11 +41,14 @@ import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.b44t.messenger.DcContact;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEvent;
-
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
 import org.thoughtcrime.securesms.connect.DcContactsLoader;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
@@ -57,46 +60,52 @@ import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;

-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
 /**
 * Fragment for selecting a one or more contacts from a list.
 *
 * @author Moxie Marlinspike
- *
 */
-public class ContactSelectionListFragment extends    Fragment
-                                          implements LoaderManager.LoaderCallbacks<DcContactsLoader.Ret>,
-                                                     DcEventCenter.DcEventDelegate
-{
+public class ContactSelectionListFragment extends Fragment
+    implements LoaderManager.LoaderCallbacks<DcContactsLoader.Ret>, DcEventCenter.DcEventDelegate {
  private static final String TAG = ContactSelectionListFragment.class.getSimpleName();

-  public static final String MULTI_SELECT          = "multi_select";
+  public static final String MULTI_SELECT = "multi_select";
  public static final String SELECT_UNENCRYPTED_EXTRA = "select_unencrypted_extra";
  public static final String ALLOW_CREATION = "allow_creation";
  public static final String PRESELECTED_CONTACTS = "preselected_contacts";
-  public static final int CONTACT_ADDR_RESULT_CODE = 61123;

  private DcContext dcContext;

-  private Set<Integer>              selectedContacts;
+  private Set<Integer> selectedContacts;
+  private Set<Integer> deselectedContacts;
  private OnContactSelectedListener onContactSelectedListener;
-  private String                    cursorFilter;
-  private RecyclerView              recyclerView;
-  private TextView                  emptyView;
-  private ActionMode                actionMode;
-  private ActionMode.Callback       actionModeCallback;
+  private String cursorFilter;
+  private RecyclerView recyclerView;
+  private TextView emptyView;
+  private ActionMode actionMode;
+  private ActionMode.Callback actionModeCallback;
+  private ActivityResultLauncher<Intent> newContactLauncher;

  @Override
-  public void onActivityCreated(Bundle icicle) {
-    super.onActivityCreated(icicle);
+  public void onCreate(Bundle paramBundle) {
+    super.onCreate(paramBundle);

-    dcContext = DcHelper.getContext(getActivity());
-    DcHelper.getEventCenter(getActivity()).addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this);
-    initializeCursor();
+    dcContext = DcHelper.getContext(requireContext());
+    newContactLauncher =
+        registerForActivityResult(
+            new ActivityResultContracts.StartActivityForResult(),
+            result -> {
+              if (result.getResultCode() == Activity.RESULT_OK && result.getData() != null) {
+                int contactId =
+                    result.getData().getIntExtra(NewContactActivity.CONTACT_ID_EXTRA, 0);
+                if (contactId != 0) {
+                  selectedContacts.add(contactId);
+                  deselectedContacts.remove(contactId);
+                }
+                LoaderManager.getInstance(this)
+                    .restartLoader(0, null, ContactSelectionListFragment.this);
+              }
+            });
  }

  @Override
@@ -112,52 +121,59 @@ public class ContactSelectionListFragment extends    Fragment
  }

  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+  public View onCreateView(
+      LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
    View view = inflater.inflate(R.layout.contact_selection_list_fragment, container, false);

-    recyclerView            = ViewUtil.findById(view, R.id.recycler_view);
-    emptyView               = ViewUtil.findById(view, android.R.id.empty);
+    recyclerView = ViewUtil.findById(view, R.id.recycler_view);
+    emptyView = ViewUtil.findById(view, android.R.id.empty);

    // add padding to avoid content hidden behind system bars
    ViewUtil.applyWindowInsets(recyclerView, true, false, true, true);

    recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
-    actionModeCallback = new ActionMode.Callback() {
-      @Override
-      public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
-        MenuInflater inflater = getActivity().getMenuInflater();
-        inflater.inflate(R.menu.contact_list, menu);
-        updateActionModeState(actionMode);
-        return true;
-      }
+    actionModeCallback =
+        new ActionMode.Callback() {
+          @Override
+          public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
+            MenuInflater inflater = getActivity().getMenuInflater();
+            inflater.inflate(R.menu.contact_list, menu);
+            menu.findItem(R.id.menu_delete_selected).setVisible(!isMulti());
+            updateActionModeState(actionMode);
+            return true;
+          }

-      @Override
-      public boolean onPrepareActionMode(ActionMode actionMode, Menu menu) {
-        return false;
-      }
+          @Override
+          public boolean onPrepareActionMode(ActionMode actionMode, Menu menu) {
+            return false;
+          }

-      @Override
-      public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) {
-        int itemId = menuItem.getItemId();
-        if (itemId == R.id.menu_select_all) {
-          handleSelectAll();
-          return true;
-        } else if (itemId == R.id.menu_view_profile) {
-          handleViewProfile();
-          return true;
-        } else if (itemId == R.id.menu_delete_selected) {
-          handleDeleteSelected();
-          return true;
-        }
-        return false;
-      }
+          @Override
+          public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) {
+            int itemId = menuItem.getItemId();
+            if (itemId == R.id.menu_select_all) {
+              handleSelectAll();
+              return true;
+            } else if (itemId == R.id.menu_view_profile) {
+              handleViewProfile();
+              return true;
+            } else if (itemId == R.id.menu_delete_selected) {
+              handleDeleteSelected();
+              return true;
+            }
+            return false;
+          }

-      @Override
-      public void onDestroyActionMode(ActionMode actionMode) {
-        ContactSelectionListFragment.this.actionMode = null;
-        getContactSelectionListAdapter().resetActionModeSelection();
-      }
-    };
+          @Override
+          public void onDestroyActionMode(ActionMode actionMode) {
+            ContactSelectionListFragment.this.actionMode = null;
+            getContactSelectionListAdapter().resetActionModeSelection();
+          }
+        };
+
+    DcHelper.getEventCenter(requireActivity())
+        .addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this);
+    initializeCursor();

    return view;
  }
@@ -189,22 +205,28 @@ public class ContactSelectionListFragment extends    Fragment
  }

  private void handleDeleteSelected() {
-    AlertDialog dialog = new AlertDialog.Builder(getActivity())
-      .setMessage(R.string.ask_delete_contacts)
-      .setPositiveButton(R.string.delete, (d, i) -> {
-          ContactSelectionListAdapter adapter = getContactSelectionListAdapter();
-          final SparseIntArray actionModeSelection = adapter.getActionModeSelection().clone();
-          new Thread(() -> {
-            for (int index = 0; index < actionModeSelection.size(); index++) {
-              int contactId = actionModeSelection.valueAt(index);
-              dcContext.deleteContact(contactId);
-            }
-          }).start();
-          adapter.resetActionModeSelection();
-          actionMode.finish();
-          })
-      .setNegativeButton(R.string.cancel, null)
-      .show();
+    AlertDialog dialog =
+        new AlertDialog.Builder(getActivity())
+            .setMessage(R.string.ask_delete_contacts)
+            .setPositiveButton(
+                R.string.delete,
+                (d, i) -> {
+                  ContactSelectionListAdapter adapter = getContactSelectionListAdapter();
+                  final SparseIntArray actionModeSelection =
+                      adapter.getActionModeSelection().clone();
+                  new Thread(
+                          () -> {
+                            for (int index = 0; index < actionModeSelection.size(); index++) {
+                              int contactId = actionModeSelection.valueAt(index);
+                              dcContext.deleteContact(contactId);
+                            }
+                          })
+                      .start();
+                  adapter.resetActionModeSelection();
+                  actionMode.finish();
+                })
+            .setNegativeButton(R.string.cancel, null)
+            .show();
    Util.redPositiveButton(dialog);
  }

@@ -213,7 +235,8 @@ public class ContactSelectionListFragment extends    Fragment
  }

  @Override
-  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+  public void onRequestPermissionsResult(
+      int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
  }

@@ -226,6 +249,15 @@ public class ContactSelectionListFragment extends    Fragment
    return selected;
  }

+  public @NonNull List<Integer> getDeselectedContacts() {
+    List<Integer> deselected = new LinkedList<>();
+    if (deselectedContacts != null) {
+      deselected.addAll(deselectedContacts);
+    }
+
+    return deselected;
+  }
+
  private boolean isMulti() {
    return getActivity().getIntent().getBooleanExtra(MULTI_SELECT, false);
  }
@@ -235,14 +267,14 @@ public class ContactSelectionListFragment extends    Fragment
  }

  private void initializeCursor() {
-    ContactSelectionListAdapter adapter = new ContactSelectionListAdapter(getActivity(),
-            GlideApp.with(this),
-            new ListClickListener(),
-            isMulti(),
-            true);
+    ContactSelectionListAdapter adapter =
+        new ContactSelectionListAdapter(
+            getActivity(), GlideApp.with(this), new ListClickListener(), isMulti(), true);
    selectedContacts = adapter.getSelectedContacts();
-    ArrayList<Integer> preselectedContacts = getActivity().getIntent().getIntegerArrayListExtra(PRESELECTED_CONTACTS);
-    if(preselectedContacts!=null) {
+    deselectedContacts = new HashSet<>();
+    ArrayList<Integer> preselectedContacts =
+        getActivity().getIntent().getIntegerArrayListExtra(PRESELECTED_CONTACTS);
+    if (preselectedContacts != null) {
      selectedContacts.addAll(preselectedContacts);
    }
    recyclerView.setAdapter(adapter);
@@ -257,11 +289,20 @@ public class ContactSelectionListFragment extends    Fragment
  public Loader<DcContactsLoader.Ret> onCreateLoader(int id, Bundle args) {
    final boolean allowCreation = getActivity().getIntent().getBooleanExtra(ALLOW_CREATION, true);
    final boolean addCreateContactLink = allowCreation && isUnencrypted();
-    final boolean addCreateGroupLinks = allowCreation && !isRelayingMessageContent(getActivity()) && !isMulti();
+    final boolean addCreateGroupLinks =
+        allowCreation && !isRelayingMessageContent(getActivity()) && !isMulti();
    final boolean addScanQRLink = allowCreation && !isMulti();

-    final int listflags = DcContext.DC_GCL_ADD_SELF | (isUnencrypted()? DcContext.DC_GCL_ADDRESS : 0);
-    return new DcContactsLoader(getActivity(), listflags, cursorFilter, addCreateGroupLinks, addCreateContactLink, addScanQRLink, false);
+    final int listflags =
+        DcContext.DC_GCL_ADD_SELF | (isUnencrypted() ? DcContext.DC_GCL_ADDRESS : 0);
+    return new DcContactsLoader(
+        getActivity(),
+        listflags,
+        cursorFilter,
+        addCreateGroupLinks,
+        addCreateContactLink,
+        addScanQRLink,
+        false);
  }

  @Override
@@ -285,15 +326,14 @@ public class ContactSelectionListFragment extends    Fragment

  private class ListClickListener implements ContactSelectionListAdapter.ItemClickListener {
    @Override
-    public void onItemClick(ContactSelectionListItem contact, boolean handleActionMode)
-    {
+    public void onItemClick(ContactSelectionListItem contact, boolean handleActionMode) {
      if (handleActionMode) {
        if (actionMode != null) {
          updateActionModeState(actionMode);
        }
        return;
      }
-      int    contactId = contact.getSpecialId();
+      int contactId = contact.getSpecialId();
      if (!isMulti() || !selectedContacts.contains(contactId)) {
        if (contactId == DcContact.DC_CONTACT_ID_NEW_CLASSIC_CONTACT) {
          Intent intent = new Intent(getContext(), NewContactActivity.class);
@@ -301,7 +341,7 @@ public class ContactSelectionListFragment extends    Fragment
            intent.putExtra(NewContactActivity.ADDR_EXTRA, cursorFilter);
          }
          if (isMulti()) {
-            startActivityForResult(intent, CONTACT_ADDR_RESULT_CODE);
+            newContactLauncher.launch(intent);
          } else {
            requireContext().startActivity(intent);
          }
@@ -309,12 +349,14 @@ public class ContactSelectionListFragment extends    Fragment
        }

        selectedContacts.add(contactId);
+        deselectedContacts.remove(contactId);
        contact.setChecked(true);
        if (onContactSelectedListener != null) {
          onContactSelectedListener.onContactSelected(contactId);
        }
      } else {
        selectedContacts.remove(contactId);
+        deselectedContacts.add(contactId);
        contact.setChecked(false);
        if (onContactSelectedListener != null) {
          onContactSelectedListener.onContactDeselected(contactId);
@@ -325,37 +367,26 @@ public class ContactSelectionListFragment extends    Fragment
    @Override
    public void onItemLongClick(ContactSelectionListItem view) {
      if (actionMode == null) {
-        actionMode = ((AppCompatActivity)getActivity()).startSupportActionMode(actionModeCallback);
+        actionMode = ((AppCompatActivity) getActivity()).startSupportActionMode(actionModeCallback);
      } else {
        updateActionModeState(actionMode);
      }
    }
  }

-    public void setOnContactSelectedListener(OnContactSelectedListener onContactSelectedListener) {
+  public void setOnContactSelectedListener(OnContactSelectedListener onContactSelectedListener) {
    this.onContactSelectedListener = onContactSelectedListener;
  }

  public interface OnContactSelectedListener {
    void onContactSelected(int contactId);
+
    void onContactDeselected(int contactId);
  }

  @Override
  public void handleEvent(@NonNull DcEvent event) {
-    if (event.getId()==DcContext.DC_EVENT_CONTACTS_CHANGED) {
-      getLoaderManager().restartLoader(0, null, ContactSelectionListFragment.this);
-    }
-  }
-
-  @Override
-  public void onActivityResult(int reqCode, int resultCode, final Intent data) {
-    super.onActivityResult(reqCode, resultCode, data);
-    if (resultCode == Activity.RESULT_OK && reqCode == CONTACT_ADDR_RESULT_CODE) {
-      int contactId = data.getIntExtra(NewContactActivity.CONTACT_ID_EXTRA, 0);
-      if (contactId != 0) {
-        selectedContacts.add(contactId);
-      }
+    if (event.getId() == DcContext.DC_EVENT_CONTACTS_CHANGED) {
      getLoaderManager().restartLoader(0, null, ContactSelectionListFragment.this);
    }
  }
@@ -23,17 +23,23 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.b44t.messenger.DcChat;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcMsg;
-
+import java.lang.ref.SoftReference;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import org.thoughtcrime.securesms.ConversationAdapter.HeaderViewHolder;
+import org.thoughtcrime.securesms.components.audioplay.AudioPlaybackViewModel;
+import org.thoughtcrime.securesms.components.audioplay.AudioView;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -43,60 +49,52 @@ import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;

-import java.lang.ref.SoftReference;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 /**
- * A DC adapter for a conversation thread.  Ultimately
- * used by ConversationActivity to display a conversation
- * thread in a ListActivity.
+ * A DC adapter for a conversation thread. Ultimately used by ConversationActivity to display a
+ * conversation thread in a ListActivity.
 *
 * @author Moxie Marlinspike
- *
 */
-public class ConversationAdapter <V extends View & BindableConversationItem>
+// FIXME: this breaks type checks, that is why there are so many casts.
+public class ConversationAdapter<V extends View & BindableConversationItem>
    extends RecyclerView.Adapter
-  implements StickyHeaderDecoration.StickyHeaderAdapter<HeaderViewHolder>
-{
+    implements StickyHeaderDecoration.StickyHeaderAdapter<HeaderViewHolder> {

  private static final int MAX_CACHE_SIZE = 40;
-  private final Map<Integer,SoftReference<DcMsg>> recordCache =
-      Collections.synchronizedMap(new LRUCache<Integer,SoftReference<DcMsg>>(MAX_CACHE_SIZE));
+  private final Map<Integer, SoftReference<DcMsg>> recordCache =
+      Collections.synchronizedMap(new LRUCache<Integer, SoftReference<DcMsg>>(MAX_CACHE_SIZE));

-  private static final int MESSAGE_TYPE_OUTGOING           = 0;
-  private static final int MESSAGE_TYPE_INCOMING           = 1;
-  private static final int MESSAGE_TYPE_INFO               = 2;
-  private static final int MESSAGE_TYPE_AUDIO_OUTGOING     = 3;
-  private static final int MESSAGE_TYPE_AUDIO_INCOMING     = 4;
+  private static final int MESSAGE_TYPE_OUTGOING = 0;
+  private static final int MESSAGE_TYPE_INCOMING = 1;
+  private static final int MESSAGE_TYPE_INFO = 2;
+  private static final int MESSAGE_TYPE_AUDIO_OUTGOING = 3;
+  private static final int MESSAGE_TYPE_AUDIO_INCOMING = 4;
  private static final int MESSAGE_TYPE_THUMBNAIL_OUTGOING = 5;
  private static final int MESSAGE_TYPE_THUMBNAIL_INCOMING = 6;
-  private static final int MESSAGE_TYPE_DOCUMENT_OUTGOING  = 7;
-  private static final int MESSAGE_TYPE_DOCUMENT_INCOMING  = 8;
-  private static final int MESSAGE_TYPE_STICKER_INCOMING   = 9;
-  private static final int MESSAGE_TYPE_STICKER_OUTGOING   = 10;
+  private static final int MESSAGE_TYPE_DOCUMENT_OUTGOING = 7;
+  private static final int MESSAGE_TYPE_DOCUMENT_INCOMING = 8;
+  private static final int MESSAGE_TYPE_STICKER_INCOMING = 9;
+  private static final int MESSAGE_TYPE_STICKER_OUTGOING = 10;

  private final Set<DcMsg> batchSelected = Collections.synchronizedSet(new HashSet<DcMsg>());

  private final @Nullable ItemClickListener clickListener;
-  private final @NonNull  GlideRequests     glideRequests;
-  private final @NonNull  Recipient         recipient;
-  private final @NonNull  LayoutInflater    inflater;
-  private final @NonNull  Context           context;
-  private final @NonNull  Calendar          calendar;
+  private final @NonNull GlideRequests glideRequests;
+  private final @NonNull Recipient recipient;
+  private final @NonNull LayoutInflater inflater;
+  private final @NonNull Context context;
+  private final @NonNull Calendar calendar;

-  private final DcContext      dcContext;
-  private @NonNull DcChat      dcChat;
-  private @NonNull int[]       dcMsgList = new int[0];
-  private int                  positionToPulseHighlight = -1;
-  private int                  positionCurrentlyPulseHighlighting = -1;
-  private long                 pulseHighlightingSince = -1;
-  private int                  lastSeenPosition = -1;
-  private long                 lastSeen = -1;
+  private final DcContext dcContext;
+  private @NonNull DcChat dcChat;
+  private @NonNull int[] dcMsgList = new int[0];
+  private int positionToPulseHighlight = -1;
+  private int positionCurrentlyPulseHighlighting = -1;
+  private long pulseHighlightingSince = -1;
+  private int lastSeenPosition = -1;
+  private long lastSeen = -1;
+  private AudioPlaybackViewModel playbackViewModel;
+  private AudioView.OnActionListener audioPlayPauseListener;

  protected static class ViewHolder extends RecyclerView.ViewHolder {
    public <V extends View & BindableConversationItem> ViewHolder(final @NonNull V itemView) {
@@ -105,7 +103,7 @@ public class ConversationAdapter <V extends View & BindableConversationItem>

    @SuppressWarnings("unchecked")
    public <V extends View & BindableConversationItem> V getView() {
-      return (V)itemView;
+      return (V) itemView;
    }

    public BindableConversationItem getItem() {
@@ -113,16 +111,14 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
    }
  }

-
  public boolean isActive() {
    return dcMsgList.length > 0;
  }

-  public @NonNull DcChat getChat(){
+  public @NonNull DcChat getChat() {
    return dcChat;
  }

-
  public void setLastSeen(long timestamp) {
    lastSeen = timestamp;
  }
@@ -146,14 +142,14 @@ public class ConversationAdapter <V extends View & BindableConversationItem>

  @Override
  public long getItemId(int position) {
-    if (position<0 || position>=dcMsgList.length) {
+    if (position < 0 || position >= dcMsgList.length) {
      return 0;
    }
-    return dcMsgList[dcMsgList.length-1-position];
+    return dcMsgList[dcMsgList.length - 1 - position];
  }

  public @NonNull DcMsg getMsg(int position) {
-    if(position<0 || position>=dcMsgList.length) {
+    if (position < 0 || position >= dcMsgList.length) {
      return new DcMsg(0);
    }

@@ -165,17 +161,23 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
      }
    }

-    final DcMsg fromDb = dcContext.getMsg((int)getItemId(position));
+    final DcMsg fromDb = dcContext.getMsg((int) getItemId(position));
    recordCache.put(position, new SoftReference<>(fromDb));
    return fromDb;
  }

-  /**
-   * Returns the position of the message with msgId in the chat list, counted from the top
-   */
+  public void setPlaybackViewModel(AudioPlaybackViewModel playbackViewModel) {
+    this.playbackViewModel = playbackViewModel;
+  }
+
+  public void setAudioPlayPauseListener(AudioView.OnActionListener audioPlayPauseListener) {
+    this.audioPlayPauseListener = audioPlayPauseListener;
+  }
+
+  /** Returns the position of the message with msgId in the chat list, counted from the top */
  public int msgIdToPosition(int msgId) {
-    for(int i=0; i<dcMsgList.length; i++ ) {
-      if(dcMsgList[i]==msgId) {
+    for (int i = 0; i < dcMsgList.length; i++) {
+      if (dcMsgList[i] == msgId) {
        return dcMsgList.length - 1 - i;
      }
    }
@@ -200,17 +202,18 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
    }
  }

-
  interface ItemClickListener extends BindableConversationItem.EventListener {
    void onItemClick(DcMsg item);
+
    void onItemLongClick(DcMsg item, View view);
  }

-  public ConversationAdapter(@NonNull Context context,
-                             @NonNull DcChat dcChat,
-                             @NonNull GlideRequests glideRequests,
-                             @Nullable ItemClickListener clickListener,
-                             @NonNull Recipient recipient) {
+  public ConversationAdapter(
+      @NonNull Context context,
+      @NonNull DcChat dcChat,
+      @NonNull GlideRequests glideRequests,
+      @Nullable ItemClickListener clickListener,
+      @NonNull Recipient recipient) {
    this.dcChat = dcChat;
    this.glideRequests = glideRequests;
    this.clickListener = clickListener;
@@ -218,14 +221,14 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
    this.context = context;
    this.inflater = LayoutInflater.from(context);
    this.calendar = Calendar.getInstance();
-    this.dcContext     = DcHelper.getContext(context);
+    this.dcContext = DcHelper.getContext(context);

    setHasStableIds(true);
  }

  @Override
  public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) {
-    ConversationAdapter.ViewHolder holder = (ConversationAdapter.ViewHolder)viewHolder;
+    ConversationAdapter.ViewHolder holder = (ConversationAdapter.ViewHolder) viewHolder;

    long now = System.currentTimeMillis();
    if (position == positionToPulseHighlight) {
@@ -235,14 +238,25 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
    }

    long elapsed = now - pulseHighlightingSince;
-    boolean pulseHighlight = (positionCurrentlyPulseHighlighting == position && elapsed < PULSE_HIGHLIGHT_MILLIS);
+    boolean pulseHighlight =
+        (positionCurrentlyPulseHighlighting == position && elapsed < PULSE_HIGHLIGHT_MILLIS);

-    holder.getItem().bind(getMsg(position), dcChat, glideRequests, batchSelected, recipient, pulseHighlight);
+    holder
+        .getItem()
+        .bind(
+            getMsg(position),
+            dcChat,
+            glideRequests,
+            batchSelected,
+            recipient,
+            pulseHighlight,
+            playbackViewModel,
+            audioPlayPauseListener);
  }

  @Override
  public void onViewRecycled(@NonNull RecyclerView.ViewHolder viewHolder) {
-    if (viewHolder.itemView instanceof  ConversationItem) {
+    if (viewHolder.itemView instanceof ConversationItem) {
      ConversationSwipeAnimationHelper.update((ConversationItem) viewHolder.itemView, 0, 1);
    }
  }
@@ -250,17 +264,19 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
  @Override
  public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
    final V itemView = ViewUtil.inflate(inflater, parent, getLayoutForViewType(viewType));
-    itemView.setOnClickListener(view -> {
-      if (clickListener != null) {
-        clickListener.onItemClick(itemView.getMessageRecord());
-      }
-    });
-    itemView.setOnLongClickListener(view -> {
-      if (clickListener != null) {
-        clickListener.onItemLongClick(itemView.getMessageRecord(), view);
-      }
-      return true;
-    });
+    itemView.setOnClickListener(
+        view -> {
+          if (clickListener != null) {
+            clickListener.onItemClick(itemView.getMessageRecord());
+          }
+        });
+    itemView.setOnLongClickListener(
+        view -> {
+          if (clickListener != null) {
+            clickListener.onItemLongClick(itemView.getMessageRecord(), view);
+          }
+          return true;
+        });
    itemView.setEventListener(clickListener);
    return new ViewHolder(itemView);
  }
@@ -271,14 +287,19 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
      case MESSAGE_TYPE_THUMBNAIL_OUTGOING:
      case MESSAGE_TYPE_DOCUMENT_OUTGOING:
      case MESSAGE_TYPE_STICKER_OUTGOING:
-      case MESSAGE_TYPE_OUTGOING:        return R.layout.conversation_item_sent;
+      case MESSAGE_TYPE_OUTGOING:
+        return R.layout.conversation_item_sent;
      case MESSAGE_TYPE_AUDIO_INCOMING:
      case MESSAGE_TYPE_THUMBNAIL_INCOMING:
      case MESSAGE_TYPE_DOCUMENT_INCOMING:
      case MESSAGE_TYPE_STICKER_INCOMING:
-      case MESSAGE_TYPE_INCOMING:        return R.layout.conversation_item_received;
-      case MESSAGE_TYPE_INFO:            return R.layout.conversation_item_update;
-      default: throw new IllegalArgumentException("unsupported item view type given to ConversationAdapter");
+      case MESSAGE_TYPE_INCOMING:
+        return R.layout.conversation_item_received;
+      case MESSAGE_TYPE_INFO:
+        return R.layout.conversation_item_update;
+      default:
+        throw new IllegalArgumentException(
+            "unsupported item view type given to ConversationAdapter");
    }
  }

@@ -288,21 +309,18 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
    int type = dcMsg.getType();
    if (dcMsg.isInfo()) {
      return MESSAGE_TYPE_INFO;
-    }
-    else if (type==DcMsg.DC_MSG_AUDIO || type==DcMsg.DC_MSG_VOICE) {
-      return dcMsg.isOutgoing()? MESSAGE_TYPE_AUDIO_OUTGOING : MESSAGE_TYPE_AUDIO_INCOMING;
-    }
-    else if (type==DcMsg.DC_MSG_FILE) {
-      return dcMsg.isOutgoing()? MESSAGE_TYPE_DOCUMENT_OUTGOING : MESSAGE_TYPE_DOCUMENT_INCOMING;
-    }
-    else if (type==DcMsg.DC_MSG_IMAGE || type==DcMsg.DC_MSG_GIF || type==DcMsg.DC_MSG_VIDEO) {
-      return dcMsg.isOutgoing()? MESSAGE_TYPE_THUMBNAIL_OUTGOING : MESSAGE_TYPE_THUMBNAIL_INCOMING;
-    }
-    else if (type == DcMsg.DC_MSG_STICKER) {
-      return dcMsg.isOutgoing()? MESSAGE_TYPE_STICKER_OUTGOING : MESSAGE_TYPE_STICKER_INCOMING;
-    }
-    else {
-      return dcMsg.isOutgoing()? MESSAGE_TYPE_OUTGOING : MESSAGE_TYPE_INCOMING;
+    } else if (type == DcMsg.DC_MSG_AUDIO || type == DcMsg.DC_MSG_VOICE) {
+      return dcMsg.isOutgoing() ? MESSAGE_TYPE_AUDIO_OUTGOING : MESSAGE_TYPE_AUDIO_INCOMING;
+    } else if (type == DcMsg.DC_MSG_FILE) {
+      return dcMsg.isOutgoing() ? MESSAGE_TYPE_DOCUMENT_OUTGOING : MESSAGE_TYPE_DOCUMENT_INCOMING;
+    } else if (type == DcMsg.DC_MSG_IMAGE
+        || type == DcMsg.DC_MSG_GIF
+        || type == DcMsg.DC_MSG_VIDEO) {
+      return dcMsg.isOutgoing() ? MESSAGE_TYPE_THUMBNAIL_OUTGOING : MESSAGE_TYPE_THUMBNAIL_INCOMING;
+    } else if (type == DcMsg.DC_MSG_STICKER) {
+      return dcMsg.isOutgoing() ? MESSAGE_TYPE_STICKER_OUTGOING : MESSAGE_TYPE_STICKER_INCOMING;
+    } else {
+      return dcMsg.isOutgoing() ? MESSAGE_TYPE_OUTGOING : MESSAGE_TYPE_INCOMING;
    }
  }

@@ -325,16 +343,16 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
  }

  public void pulseHighlightItem(int position) {
-    if (position>=0 && position < getItemCount()) {
+    if (position >= 0 && position < getItemCount()) {
      positionToPulseHighlight = position;
      notifyItemChanged(position);
    }
  }

  public long getSortTimestamp(int position) {
-    if (!isActive())                return 0;
+    if (!isActive()) return 0;
    if (position >= getItemCount()) return 0;
-    if (position < 0)               return 0;
+    if (position < 0) return 0;

    DcMsg msg = getMsg(position);
    return msg.getSortTimestamp();
@@ -348,7 +366,7 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
  @Override
  public long getHeaderId(int position) {
    if (position >= getItemCount()) return -1;
-    if (position < 0)               return -1;
+    if (position < 0) return -1;

    calendar.setTime(new Date(getSortTimestamp(position)));
    return Util.hashCode(calendar.get(Calendar.YEAR), calendar.get(Calendar.DAY_OF_YEAR));
@@ -356,18 +374,17 @@ public class ConversationAdapter <V extends View & BindableConversationItem>

  @Override
  public HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent) {
-    return new HeaderViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.conversation_item_header, parent, false));
+    return new HeaderViewHolder(
+        LayoutInflater.from(getContext())
+            .inflate(R.layout.conversation_item_header, parent, false));
  }

-  /**
-   * date header view
-   */
+  /** date header view */
  @Override
  public void onBindHeaderViewHolder(HeaderViewHolder viewHolder, int position) {
    viewHolder.setText(DateUtils.getRelativeDate(getContext(), getSortTimestamp(position)));
  }

-
  public void changeData(@Nullable int[] dcMsgList) {
    // should be called when there are new messages
    this.dcMsgList = dcMsgList == null ? new int[0] : dcMsgList;
@@ -387,12 +404,11 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
  }

  private int findLastSeenPosition(long lastSeen) {
-    if (lastSeen <= 0)     return -1;
-    if (!isActive())       return -1;
+    if (lastSeen <= 0) return -1;
+    if (!isActive()) return -1;

    int count = getItemCount();

-
    for (int i = 0; i < count; i++) {
      DcMsg msg = getMsg(i);
      if (msg.isOutgoing() || msg.getTimestamp() <= lastSeen) {
@@ -404,11 +420,16 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
  }

  public HeaderViewHolder onCreateLastSeenViewHolder(ViewGroup parent) {
-    return new HeaderViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.conversation_item_last_seen, parent, false));
+    return new HeaderViewHolder(
+        LayoutInflater.from(getContext())
+            .inflate(R.layout.conversation_item_last_seen, parent, false));
  }

  public void onBindLastSeenViewHolder(HeaderViewHolder viewHolder, int position) {
-    viewHolder.setText(getContext().getResources().getQuantityString(R.plurals.chat_n_new_messages, (position + 1), (position + 1)));
+    viewHolder.setText(
+        getContext()
+            .getResources()
+            .getQuantityString(R.plurals.chat_n_new_messages, (position + 1), (position + 1)));
  }

  static class LastSeenHeader extends StickyHeaderDecoration {
@@ -416,32 +437,45 @@ public class ConversationAdapter <V extends View & BindableConversationItem>

    LastSeenHeader(ConversationAdapter adapter) {
      super(adapter, false, false);
-      this.adapter           = adapter;
+      this.adapter = adapter;
    }

    @Override
-    protected boolean hasHeader(RecyclerView parent, StickyHeaderAdapter stickyAdapter, int position) {
-      return  adapter.isActive() && position == adapter.getLastSeenPosition();
+    protected boolean hasHeader(
+        RecyclerView parent, StickyHeaderAdapter stickyAdapter, int position) {
+      return adapter.isActive() && position == adapter.getLastSeenPosition();
    }

    @Override
-    protected int getHeaderTop(RecyclerView parent, View child, View header, int adapterPos, int layoutPos) {
+    protected int getHeaderTop(
+        RecyclerView parent, View child, View header, int adapterPos, int layoutPos) {
      return parent.getLayoutManager().getDecoratedTop(child);
    }

    @Override
-    protected HeaderViewHolder getHeader(RecyclerView parent, StickyHeaderAdapter stickyAdapter, int position) {
+    protected HeaderViewHolder getHeader(
+        RecyclerView parent, StickyHeaderAdapter stickyAdapter, int position) {
      HeaderViewHolder viewHolder = adapter.onCreateLastSeenViewHolder(parent);
      adapter.onBindLastSeenViewHolder(viewHolder, position);

-      int widthSpec  = View.MeasureSpec.makeMeasureSpec(parent.getWidth(), View.MeasureSpec.EXACTLY);
-      int heightSpec = View.MeasureSpec.makeMeasureSpec(parent.getHeight(), View.MeasureSpec.UNSPECIFIED);
+      int widthSpec = View.MeasureSpec.makeMeasureSpec(parent.getWidth(), View.MeasureSpec.EXACTLY);
+      int heightSpec =
+          View.MeasureSpec.makeMeasureSpec(parent.getHeight(), View.MeasureSpec.UNSPECIFIED);

-      int childWidth  = ViewGroup.getChildMeasureSpec(widthSpec, parent.getPaddingLeft() + parent.getPaddingRight(), viewHolder.itemView.getLayoutParams().width);
-      int childHeight = ViewGroup.getChildMeasureSpec(heightSpec, parent.getPaddingTop() + parent.getPaddingBottom(), viewHolder.itemView.getLayoutParams().height);
+      int childWidth =
+          ViewGroup.getChildMeasureSpec(
+              widthSpec,
+              parent.getPaddingLeft() + parent.getPaddingRight(),
+              viewHolder.itemView.getLayoutParams().width);
+      int childHeight =
+          ViewGroup.getChildMeasureSpec(
+              heightSpec,
+              parent.getPaddingTop() + parent.getPaddingBottom(),
+              viewHolder.itemView.getLayoutParams().height);

      viewHolder.itemView.measure(childWidth, childHeight);
-      viewHolder.itemView.layout(0, 0, viewHolder.itemView.getMeasuredWidth(), viewHolder.itemView.getMeasuredHeight());
+      viewHolder.itemView.layout(
+          0, 0, viewHolder.itemView.getMeasuredWidth(), viewHolder.itemView.getMeasuredHeight());

      return viewHolder;
    }
@@ -6,40 +6,37 @@ import android.graphics.Canvas;
 import android.os.Vibrator;
 import android.view.MotionEvent;
 import android.view.View;
-
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.b44t.messenger.DcMsg;
-
 import org.thoughtcrime.securesms.util.AccessibilityUtil;
 import org.thoughtcrime.securesms.util.ServiceUtil;

 class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallback {

-  private static final float SWIPE_SUCCESS_DX           = ConversationSwipeAnimationHelper.TRIGGER_DX;
-  private static final long  SWIPE_SUCCESS_VIBE_TIME_MS = 10;
+  private static final float SWIPE_SUCCESS_DX = ConversationSwipeAnimationHelper.TRIGGER_DX;
+  private static final long SWIPE_SUCCESS_VIBE_TIME_MS = 10;

  private boolean swipeBack;
  private boolean shouldTriggerSwipeFeedback;
  private boolean canTriggerSwipe;
-  private float   latestDownX;
-  private float   latestDownY;
+  private float latestDownX;
+  private float latestDownY;

-  private final SwipeAvailabilityProvider     swipeAvailabilityProvider;
+  private final SwipeAvailabilityProvider swipeAvailabilityProvider;
  private final ConversationItemTouchListener itemTouchListener;
-  private final OnSwipeListener               onSwipeListener;
+  private final OnSwipeListener onSwipeListener;

-  ConversationItemSwipeCallback(@NonNull SwipeAvailabilityProvider swipeAvailabilityProvider,
-                                @NonNull OnSwipeListener onSwipeListener)
-  {
+  ConversationItemSwipeCallback(
+      @NonNull SwipeAvailabilityProvider swipeAvailabilityProvider,
+      @NonNull OnSwipeListener onSwipeListener) {
    super(0, ItemTouchHelper.END);
-    this.itemTouchListener          = new ConversationItemTouchListener(this::updateLatestDownCoordinate);
-    this.swipeAvailabilityProvider  = swipeAvailabilityProvider;
-    this.onSwipeListener            = onSwipeListener;
+    this.itemTouchListener = new ConversationItemTouchListener(this::updateLatestDownCoordinate);
+    this.swipeAvailabilityProvider = swipeAvailabilityProvider;
+    this.onSwipeListener = onSwipeListener;
    this.shouldTriggerSwipeFeedback = true;
-    this.canTriggerSwipe            = true;
+    this.canTriggerSwipe = true;
  }

  void attachToRecyclerView(@NonNull RecyclerView recyclerView) {
@@ -48,21 +45,19 @@ class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallback {
  }

  @Override
-  public boolean onMove(@NonNull RecyclerView recyclerView,
-                        @NonNull RecyclerView.ViewHolder viewHolder,
-                        @NonNull RecyclerView.ViewHolder target)
-  {
+  public boolean onMove(
+      @NonNull RecyclerView recyclerView,
+      @NonNull RecyclerView.ViewHolder viewHolder,
+      @NonNull RecyclerView.ViewHolder target) {
    return false;
  }

  @Override
-  public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {
-  }
+  public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {}

  @Override
-  public int getSwipeDirs(@NonNull RecyclerView recyclerView,
-                          @NonNull RecyclerView.ViewHolder viewHolder)
-  {
+  public int getSwipeDirs(
+      @NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
    if (cannotSwipeViewHolder(viewHolder)) return 0;
    return super.getSwipeDirs(recyclerView, viewHolder);
  }
@@ -78,18 +73,21 @@ class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallback {

  @Override
  public void onChildDraw(
-          @NonNull Canvas c,
-          @NonNull RecyclerView recyclerView,
-          @NonNull RecyclerView.ViewHolder viewHolder,
-          float dx, float dy, int actionState, boolean isCurrentlyActive)
-  {
+      @NonNull Canvas c,
+      @NonNull RecyclerView recyclerView,
+      @NonNull RecyclerView.ViewHolder viewHolder,
+      float dx,
+      float dy,
+      int actionState,
+      boolean isCurrentlyActive) {
    if (cannotSwipeViewHolder(viewHolder)) return;

-    float   sign              = getSignFromDirection(viewHolder.itemView);
+    float sign = getSignFromDirection(viewHolder.itemView);
    boolean isCorrectSwipeDir = sameSign(dx, sign);

    if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE && isCorrectSwipeDir) {
-      ConversationSwipeAnimationHelper.update((ConversationItem) viewHolder.itemView, Math.abs(dx), sign);
+      ConversationSwipeAnimationHelper.update(
+          (ConversationItem) viewHolder.itemView, Math.abs(dx), sign);
      handleSwipeFeedback((ConversationItem) viewHolder.itemView, Math.abs(dx));
      if (canTriggerSwipe) {
        setTouchListener(recyclerView, viewHolder, Math.abs(dx));
@@ -100,7 +98,7 @@ class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallback {

    if (dx == 0) {
      shouldTriggerSwipeFeedback = true;
-      canTriggerSwipe            = true;
+      canTriggerSwipe = true;
    }
  }

@@ -122,50 +120,50 @@ class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallback {
  }

  @SuppressLint("ClickableViewAccessibility")
-  private void setTouchListener(@NonNull RecyclerView recyclerView,
-                                @NonNull RecyclerView.ViewHolder viewHolder,
-                                float dx)
-  {
-    recyclerView.setOnTouchListener(new View.OnTouchListener() {
+  private void setTouchListener(
+      @NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, float dx) {
+    recyclerView.setOnTouchListener(
+        new View.OnTouchListener() {

-      // This variable is necessary to make sure that the handleTouchActionUp() and therefore onSwiped() is called only once.
-      // Otherwise, any subsequent little swipe would invoke onSwiped().
-      // We can't call recyclerView.setOnTouchListener(null) because another ConversationItem might have set its own
-      // on touch listener in the meantime and we don't want to cancel it
-      private boolean listenerCalled = false;
+          // This variable is necessary to make sure that the handleTouchActionUp() and therefore
+          // onSwiped() is called only once.
+          // Otherwise, any subsequent little swipe would invoke onSwiped().
+          // We can't call recyclerView.setOnTouchListener(null) because another ConversationItem
+          // might have set its own
+          // on touch listener in the meantime and we don't want to cancel it
+          private boolean listenerCalled = false;

-      @Override
-      public boolean onTouch(View v, MotionEvent event) {
-        switch (event.getAction()) {
-          case MotionEvent.ACTION_DOWN:
-            shouldTriggerSwipeFeedback = true;
-            break;
-          case MotionEvent.ACTION_UP:
-            if (!listenerCalled) {
-              listenerCalled = true;
-              ConversationItemSwipeCallback.this.handleTouchActionUp(recyclerView, viewHolder, dx);
+          @Override
+          public boolean onTouch(View v, MotionEvent event) {
+            switch (event.getAction()) {
+              case MotionEvent.ACTION_DOWN:
+                shouldTriggerSwipeFeedback = true;
+                break;
+              case MotionEvent.ACTION_UP:
+                if (!listenerCalled) {
+                  listenerCalled = true;
+                  ConversationItemSwipeCallback.this.handleTouchActionUp(
+                      recyclerView, viewHolder, dx);
+                }
+              // fallthrough
+              case MotionEvent.ACTION_CANCEL:
+                swipeBack = true;
+                shouldTriggerSwipeFeedback = false;
+                // Sometimes the view does not go back correctly, so make sure that after 2s the
+                // progress is reset:
+                viewHolder.itemView.postDelayed(() -> resetProgress(viewHolder), 2000);
+                if (AccessibilityUtil.areAnimationsDisabled(viewHolder.itemView.getContext())) {
+                  resetProgress(viewHolder);
+                }
+                break;
            }
-            //fallthrough
-          case MotionEvent.ACTION_CANCEL:
-            swipeBack = true;
-            shouldTriggerSwipeFeedback = false;
-            // Sometimes the view does not go back correctly, so make sure that after 2s the progress is reset:
-            viewHolder.itemView.postDelayed(() -> resetProgress(viewHolder), 2000);
-            if (AccessibilityUtil.areAnimationsDisabled(viewHolder.itemView.getContext())) {
-              resetProgress(viewHolder);
-            }
-            break;
-        }
-        return false;
-      }
-
-    });
+            return false;
+          }
+        });
  }

-  private void handleTouchActionUp(@NonNull RecyclerView recyclerView,
-                                   @NonNull RecyclerView.ViewHolder viewHolder,
-                                   float dx)
-  {
+  private void handleTouchActionUp(
+      @NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, float dx) {
    if (dx > SWIPE_SUCCESS_DX) {
      canTriggerSwipe = false;
      onSwiped(viewHolder);
@@ -177,17 +175,16 @@ class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallback {
  }

  private static void resetProgress(RecyclerView.ViewHolder viewHolder) {
-    ConversationSwipeAnimationHelper.update((ConversationItem) viewHolder.itemView,
-            0f,
-            getSignFromDirection(viewHolder.itemView));
+    ConversationSwipeAnimationHelper.update(
+        (ConversationItem) viewHolder.itemView, 0f, getSignFromDirection(viewHolder.itemView));
  }

  private boolean cannotSwipeViewHolder(@NonNull RecyclerView.ViewHolder viewHolder) {
    if (!(viewHolder.itemView instanceof ConversationItem)) return true;

    ConversationItem item = ((ConversationItem) viewHolder.itemView);
-    return !swipeAvailabilityProvider.isSwipeAvailable(item.getMessageRecord()) ||
-            item.disallowSwipe(latestDownX, latestDownY);
+    return !swipeAvailabilityProvider.isSwipeAvailable(item.getMessageRecord())
+        || item.disallowSwipe(latestDownX, latestDownY);
  }

  private void updateLatestDownCoordinate(float x, float y) {
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms;

 import android.view.MotionEvent;
-
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;

@@ -20,10 +20,10 @@ import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_ENABLED;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_URL;
 import static org.thoughtcrime.securesms.util.ShareUtil.acquireRelayMessageContent;
 import static org.thoughtcrime.securesms.util.ShareUtil.getDirectSharingChatId;
+import static org.thoughtcrime.securesms.util.ShareUtil.getForwardedMessageAccountId;
 import static org.thoughtcrime.securesms.util.ShareUtil.getSharedTitle;
 import static org.thoughtcrime.securesms.util.ShareUtil.isDirectSharing;
 import static org.thoughtcrime.securesms.util.ShareUtil.isForwarding;
-import static org.thoughtcrime.securesms.util.ShareUtil.getForwardedMessageAccountId;
 import static org.thoughtcrime.securesms.util.ShareUtil.isRelayingMessageContent;
 import static org.thoughtcrime.securesms.util.ShareUtil.resetRelayingMessageContent;

@@ -45,14 +45,16 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import androidx.activity.OnBackPressedCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.appcompat.widget.TooltipCompat;
 import androidx.core.view.MenuCompat;
-
+import chat.delta.rpc.types.SecurejoinSource;
+import chat.delta.rpc.types.SecurejoinUiPath;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.b44t.messenger.DcAccounts;
 import com.b44t.messenger.DcContact;
@@ -60,7 +62,8 @@ import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcMsg;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
-
+import java.util.ArrayList;
+import java.util.Date;
 import org.thoughtcrime.securesms.components.AvatarView;
 import org.thoughtcrime.securesms.components.SearchToolbar;
 import org.thoughtcrime.securesms.connect.AccountManager;
@@ -77,45 +80,51 @@ import org.thoughtcrime.securesms.search.SearchFragment;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Prefs;
-import org.thoughtcrime.securesms.util.ScreenLockUtil;
-import org.thoughtcrime.securesms.util.ShareUtil;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
+import org.thoughtcrime.securesms.util.ScreenLockUtil;
 import org.thoughtcrime.securesms.util.SendRelayedMessageUtil;
+import org.thoughtcrime.securesms.util.ShareUtil;
 import org.thoughtcrime.securesms.util.StorageUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
-import chat.delta.rpc.types.SecurejoinSource;
-import chat.delta.rpc.types.SecurejoinUiPath;
-
-import java.util.ArrayList;
-import java.util.Date;

 public class ConversationListActivity extends PassphraseRequiredActionBarActivity
-    implements ConversationListFragment.ConversationSelectedListener
-{
+    implements ConversationListFragment.ConversationSelectedListener {
  private static final String TAG = ConversationListActivity.class.getSimpleName();
  private static final String OPENPGP4FPR = "openpgp4fpr";
  private static final String NDK_ARCH_WARNED = "ndk_arch_warned";
  public static final String CLEAR_NOTIFICATIONS = "clear_notifications";
  public static final String ACCOUNT_ID_EXTRA = "account_id";
-  public static final String FROM_WELCOME   = "from_welcome";
-  private static final int REQUEST_CODE_CONFIRM_CREDENTIALS_DELETE_PROFILE = ScreenLockUtil.REQUEST_CODE_CONFIRM_CREDENTIALS+1;
+  public static final String FROM_WELCOME = "from_welcome";
+  public static final String FROM_WELCOME_RAW_QR = "from_welcome_raw_qr";

  private ConversationListFragment conversationListFragment;
-  public TextView                  title;
-  private AvatarView               selfAvatar;
-  private ImageView                unreadIndicator;
-  private SearchFragment           searchFragment;
-  private SearchToolbar            searchToolbar;
-  private ImageView                searchAction;
-  private ViewGroup                fragmentContainer;
-  private ViewGroup                selfAvatarContainer;
+  public TextView title;
+  private AvatarView selfAvatar;
+  private ImageView unreadIndicator;
+  private SearchFragment searchFragment;
+  private SearchToolbar searchToolbar;
+  private ImageView searchAction;
+  private ViewGroup fragmentContainer;
+  private ViewGroup selfAvatarContainer;

-  /** used to store temporarily scanned QR to pass it back to QrCodeHandler when ScreenLockUtil is used */
+  /**
+   * used to store temporarily scanned QR to pass it back to QrCodeHandler when ScreenLockUtil is
+   * used
+   */
  private String qrData = null;
-  /** used to store temporarily profile ID to delete after authorization is granted via ScreenLockUtil */
+
+  private ActivityResultLauncher<Intent> relayLockLauncher;
+  private ActivityResultLauncher<Intent> qrScannerLauncher;
+
+  /**
+   * used to store temporarily profile ID to delete after authorization is granted via
+   * ScreenLockUtil
+   */
  private int deleteProfileId = 0;

+  private ActivityResultLauncher<Intent> deleteProfileLockLauncher;
+
  @Override
  protected void onPreCreate() {
    dynamicTheme = new DynamicNoActionBarTheme();
@@ -124,6 +133,44 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit

  @Override
  protected void onCreate(Bundle icicle, boolean ready) {
+    relayLockLauncher =
+        registerForActivityResult(
+            new ActivityResultContracts.StartActivityForResult(),
+            result -> {
+              if (result.getResultCode() == RESULT_OK) {
+                // QrCodeHandler requested user authorization before adding a relay
+                // and it was granted, so proceed to add the relay
+                if (qrData != null) {
+                  new QrCodeHandler(this).addRelay(qrData);
+                  qrData = null;
+                }
+              }
+            });
+    deleteProfileLockLauncher =
+        registerForActivityResult(
+            new ActivityResultContracts.StartActivityForResult(),
+            result -> {
+              if (result.getResultCode() == RESULT_OK) {
+                if (deleteProfileId != 0) {
+                  deleteProfile(deleteProfileId);
+                  deleteProfileId = 0;
+                }
+              }
+            });
+    qrScannerLauncher =
+        registerForActivityResult(
+            new ActivityResultContracts.StartActivityForResult(),
+            result -> {
+              if (result.getResultCode() == RESULT_OK) {
+                IntentResult scanResult =
+                    IntentIntegrator.parseActivityResult(result.getResultCode(), result.getData());
+                qrData = scanResult.getContents();
+                new QrCodeHandler(this)
+                    .handleQrData(
+                        qrData, SecurejoinSource.Scan, SecurejoinUiPath.QrIcon, relayLockLauncher);
+              }
+            });
+
    addDeviceMessages(getIntent().getBooleanExtra(FROM_WELCOME, false));
    if (getIntent().getIntExtra(ACCOUNT_ID_EXTRA, -1) <= 0) {
      getIntent().putExtra(ACCOUNT_ID_EXTRA, DcHelper.getContext(this).getAccountId());
@@ -134,72 +181,88 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit

    Toolbar toolbar = findViewById(R.id.toolbar);
    setSupportActionBar(toolbar);
-    selfAvatar               = findViewById(R.id.self_avatar);
-    selfAvatarContainer      = findViewById(R.id.self_avatar_container);
-    unreadIndicator          = findViewById(R.id.unread_indicator);
-    title                    = findViewById(R.id.toolbar_title);
-    searchToolbar            = findViewById(R.id.search_toolbar);
-    searchAction             = findViewById(R.id.search_action);
-    fragmentContainer        = findViewById(R.id.fragment_container);
+    selfAvatar = findViewById(R.id.self_avatar);
+    selfAvatarContainer = findViewById(R.id.self_avatar_container);
+    unreadIndicator = findViewById(R.id.unread_indicator);
+    title = findViewById(R.id.toolbar_title);
+    searchToolbar = findViewById(R.id.search_toolbar);
+    searchAction = findViewById(R.id.search_action);
+    fragmentContainer = findViewById(R.id.fragment_container);

    // add margin to avoid content hidden behind system bars
    ViewUtil.applyWindowInsetsAsMargin(searchToolbar, true, true, true, false);

    Bundle bundle = new Bundle();
-    conversationListFragment = initFragment(R.id.fragment_container, new ConversationListFragment(), bundle);
+    conversationListFragment =
+        initFragment(R.id.fragment_container, new ConversationListFragment(), bundle);

    initializeSearchListener();

-    getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
-      @Override
-      public void handleOnBackPressed() {
-        if (searchToolbar.isVisible()) {
-          searchToolbar.collapse();
-        } else {
-          Activity activity = ConversationListActivity.this;
-          if (isRelayingMessageContent(activity)) {
-            int selectedAccId = DcHelper.getContext(activity).getAccountId();
-            int initialAccId = getIntent().getIntExtra(ACCOUNT_ID_EXTRA, selectedAccId);
-            if (initialAccId != selectedAccId) {
-              // allowing to go back is dangerous, it could be activity on previously selected account,
-              // instead of figuring out account rollback in onResume in each activity (conversation, gallery, media preview, webxdc, etc.)
-              // just clear the back stack and stay in newly selected account
-              finishAffinity();
-              startActivity(new Intent(activity, ConversationListActivity.class));
-              return;
-            } else {
-              handleResetRelaying();
-            }
-          }
+    getOnBackPressedDispatcher()
+        .addCallback(
+            this,
+            new OnBackPressedCallback(true) {
+              @Override
+              public void handleOnBackPressed() {
+                if (searchToolbar.isVisible()) {
+                  searchToolbar.collapse();
+                } else {
+                  Activity activity = ConversationListActivity.this;
+                  if (isRelayingMessageContent(activity)) {
+                    int selectedAccId = DcHelper.getContext(activity).getAccountId();
+                    int initialAccId = getIntent().getIntExtra(ACCOUNT_ID_EXTRA, selectedAccId);
+                    if (initialAccId != selectedAccId) {
+                      // allowing to go back is dangerous, it could be activity on previously
+                      // selected account,
+                      // instead of figuring out account rollback in onResume in each activity
+                      // (conversation, gallery, media preview, webxdc, etc.)
+                      // just clear the back stack and stay in newly selected account
+                      finishAffinity();
+                      startActivity(new Intent(activity, ConversationListActivity.class));
+                      return;
+                    } else {
+                      handleResetRelaying();
+                    }
+                  }

-          setEnabled(false);
-          getOnBackPressedDispatcher().onBackPressed();
-        }
-      }
-    });
+                  setEnabled(false);
+                  getOnBackPressedDispatcher().onBackPressed();
+                }
+              }
+            });

    TooltipCompat.setTooltipText(searchAction, getText(R.string.search_explain));

    TooltipCompat.setTooltipText(selfAvatar, getText(R.string.switch_account));
-    selfAvatar.setOnClickListener(v -> AccountManager.getInstance().showSwitchAccountMenu(this, false));
-    findViewById(R.id.avatar_and_title).setOnClickListener(v -> {
-      if (!isRelayingMessageContent(this)) {
-        AccountManager.getInstance().showSwitchAccountMenu(this, false);
-      }
-    });
+    selfAvatar.setOnClickListener(
+        v -> AccountManager.getInstance().showSwitchAccountMenu(this, false));
+    findViewById(R.id.avatar_and_title)
+        .setOnClickListener(
+            v -> {
+              if (!isRelayingMessageContent(this)) {
+                AccountManager.getInstance().showSwitchAccountMenu(this, false);
+              }
+            });

    refresh();

    if (BuildConfig.DEBUG) checkNdkArchitecture();

    DcHelper.maybeShowMigrationError(this);
+
+    String rawQrString = getIntent().getStringExtra(FROM_WELCOME_RAW_QR);
+    // Launch chat directly, if coming from onboarding with a join chat/group QR
+    if (rawQrString != null) {
+      QrCodeHandler qrCodeHandler = new QrCodeHandler(this);
+      qrCodeHandler.secureJoinByQr(rawQrString, SecurejoinSource.Scan, SecurejoinUiPath.Unknown);
+    }
  }

  /**
   * If the build script is invoked with a specific architecture (e.g.`ndk-make.sh arm64-v8a`), it
   * will compile the core only for this arch. This method checks if the arch was correct.
   *
-   * In order to do this, `ndk-make.sh` writes its argument into the file `ndkArch`.
+   * <p>In order to do this, `ndk-make.sh` writes its argument into the file `ndkArch`.
   * `getNdkArch()` in `build.gradle` then reads this file and its content is assigned to
   * `BuildConfig.NDK_ARCH`.
   */
@@ -212,7 +275,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
      String arch;

      // armv8l is 32 bit mode in 64 bit CPU:
-      if (archProperty.startsWith("armv7") || archProperty.startsWith("armv8l")) arch = "armeabi-v7a";
+      if (archProperty.startsWith("armv7") || archProperty.startsWith("armv8l"))
+        arch = "armeabi-v7a";
      else if (archProperty.equals("aarch64")) arch = "arm64-v8a";
      else if (archProperty.equals("i686")) arch = "x86";
      else if (archProperty.equals("x86_64")) arch = "x86_64";
@@ -226,23 +290,35 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit

        String message;
        if (arch.equals("")) {
-          message = "This phone has the unknown architecture " + archProperty + ".\n\n"+
-                  "Please open an issue at https://github.com/deltachat/deltachat-android/issues.";
+          message =
+              "This phone has the unknown architecture "
+                  + archProperty
+                  + ".\n\n"
+                  + "Please open an issue at https://github.com/deltachat/deltachat-android/issues.";
        } else {
-          message = "Apparently you used `ndk-make.sh " + BuildConfig.NDK_ARCH + "`, but this device is " + arch + ".\n\n" +
-                  "You can use the app, but changes you made to the Rust code were not applied.\n\n" +
-                  "To compile in your changes, you can:\n" +
-                  "- Either run `ndk-make.sh " + arch + "` to build only for " + arch + " in debug mode\n" +
-                  "- Or run `ndk-make.sh` without argument to build for all architectures in release mode\n\n" +
-                  "If something doesn't work, please open an issue at https://github.com/deltachat/deltachat-android/issues!!";
+          message =
+              "Apparently you used `ndk-make.sh "
+                  + BuildConfig.NDK_ARCH
+                  + "`, but this device is "
+                  + arch
+                  + ".\n\n"
+                  + "You can use the app, but changes you made to the Rust code were not applied.\n\n"
+                  + "To compile in your changes, you can:\n"
+                  + "- Either run `ndk-make.sh "
+                  + arch
+                  + "` to build only for "
+                  + arch
+                  + " in debug mode\n"
+                  + "- Or run `ndk-make.sh` without argument to build for all architectures in release mode\n\n"
+                  + "If something doesn't work, please open an issue at https://github.com/deltachat/deltachat-android/issues!!";
        }
        Log.e(TAG, message);

        if (!Prefs.getBooleanPreference(this, NDK_ARCH_WARNED, false)) {
          new AlertDialog.Builder(this)
-                  .setMessage(message)
-                  .setPositiveButton(android.R.string.ok, null)
-                  .show();
+              .setMessage(message)
+              .setPositiveButton(android.R.string.ok, null)
+              .show();
          Prefs.setBooleanPreference(this, NDK_ARCH_WARNED, true);
        }
      }
@@ -303,7 +379,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
      getSupportActionBar().setDisplayHomeAsUpEnabled(true);
    } else {
      title.setText(DcHelper.getContext(this).getName());
-      // refreshTitle is called by ConversationListFragment when connectivity changes so update connectivity dot here
+      // refreshTitle is called by ConversationListFragment when connectivity changes so update
+      // connectivity dot here
      selfAvatar.setConnectivity(DcHelper.getContext(this).getConnectivity());
      getSupportActionBar().setDisplayHomeAsUpEnabled(false);
    }
@@ -339,23 +416,26 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
      }
    }

-    if(unreadCount == 0) {
+    if (unreadCount == 0) {
      unreadIndicator.setVisibility(View.GONE);
    } else {
      boolean isDarkTheme = DynamicTheme.isDarkTheme(this);
      int badgeColor = Color.WHITE;
      if (isDarkTheme) {
-        final TypedArray attrs = obtainStyledAttributes(new int[] {
-            R.attr.conversation_list_item_unreadcount_color,
-        });
+        final TypedArray attrs =
+            obtainStyledAttributes(
+                new int[] {
+                  R.attr.conversation_list_item_unreadcount_color,
+                });
        badgeColor = attrs.getColor(0, Color.BLACK);
      }
-      String label = unreadCount>99? "99+" : String.valueOf(unreadCount);
-      unreadIndicator.setImageDrawable(TextDrawable.builder()
+      String label = unreadCount > 99 ? "99+" : String.valueOf(unreadCount);
+      unreadIndicator.setImageDrawable(
+          TextDrawable.builder()
              .beginConfig()
              .width(ViewUtil.dpToPx(this, 20))
              .height(ViewUtil.dpToPx(this, 20))
-              .textColor(isDarkTheme? Color.WHITE : Color.BLACK)
+              .textColor(isDarkTheme ? Color.WHITE : Color.BLACK)
              .bold()
              .endConfig()
              .buildRound(label, badgeColor));
@@ -378,9 +458,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit

    if (isRelayingMessageContent(this)) {
      inflater.inflate(R.menu.forwarding_menu, menu);
-      menu.findItem(R.id.menu_export_attachment).setVisible(
-        ShareUtil.isFromWebxdc(this) && ShareUtil.getSharedUris(this).size() == 1
-      );
+      menu.findItem(R.id.menu_export_attachment)
+          .setVisible(ShareUtil.isFromWebxdc(this) && ShareUtil.getSharedUris(this).size() == 1);
    } else {
      inflater.inflate(R.menu.text_secure_normal, menu);
      menu.findItem(R.id.menu_global_map).setVisible(Prefs.isLocationStreamingEnabled(this));
@@ -389,7 +468,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
        proxyItem.setVisible(false);
      } else {
        boolean proxyEnabled = DcHelper.getInt(this, CONFIG_PROXY_ENABLED) == 1;
-        proxyItem.setIcon(proxyEnabled? R.drawable.ic_proxy_enabled_24 : R.drawable.ic_proxy_disabled_24);
+        proxyItem.setIcon(
+            proxyEnabled ? R.drawable.ic_proxy_enabled_24 : R.drawable.ic_proxy_disabled_24);
        proxyItem.setVisible(true);
      }
      MenuCompat.setGroupDividerEnabled(menu, true);
@@ -400,42 +480,42 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
  }

  private void initializeSearchListener() {
-    searchAction.setOnClickListener(v -> {
-      searchToolbar.display(searchAction.getX() + (searchAction.getWidth() / 2),
-                            searchAction.getY() + (searchAction.getHeight() / 2));
-    });
+    searchAction.setOnClickListener(
+        v -> {
+          searchToolbar.display(
+              searchAction.getX() + (searchAction.getWidth() / 2),
+              searchAction.getY() + (searchAction.getHeight() / 2));
+        });

-    searchToolbar.setListener(new SearchToolbar.SearchListener() {
-      @Override
-      public void onSearchTextChange(String text) {
-        String trimmed = text.trim();
+    searchToolbar.setListener(
+        new SearchToolbar.SearchListener() {
+          @Override
+          public void onSearchTextChange(String text) {
+            String trimmed = text.trim();

-        if (trimmed.length() > 0) {
-          if (searchFragment == null) {
-            searchFragment = SearchFragment.newInstance();
-            getSupportFragmentManager().beginTransaction()
-                                       .add(R.id.fragment_container, searchFragment, null)
-                                       .commit();
+            if (trimmed.length() > 0) {
+              if (searchFragment == null) {
+                searchFragment = SearchFragment.newInstance();
+                getSupportFragmentManager()
+                    .beginTransaction()
+                    .add(R.id.fragment_container, searchFragment, null)
+                    .commit();
+              }
+              searchFragment.updateSearchQuery(trimmed);
+            } else if (searchFragment != null) {
+              getSupportFragmentManager().beginTransaction().remove(searchFragment).commit();
+              searchFragment = null;
+            }
          }
-          searchFragment.updateSearchQuery(trimmed);
-        } else if (searchFragment != null) {
-          getSupportFragmentManager().beginTransaction()
-                                     .remove(searchFragment)
-                                     .commit();
-          searchFragment = null;
-        }
-      }

-      @Override
-      public void onSearchClosed() {
-        if (searchFragment != null) {
-          getSupportFragmentManager().beginTransaction()
-                                     .remove(searchFragment)
-                                     .commit();
-          searchFragment = null;
-        }
-      }
-    });
+          @Override
+          public void onSearchClosed() {
+            if (searchFragment != null) {
+              getSupportFragmentManager().beginTransaction().remove(searchFragment).commit();
+              searchFragment = null;
+            }
+          }
+        });
  }

  @Override
@@ -450,7 +530,9 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
      startActivity(new Intent(this, ApplicationPreferencesActivity.class));
      return true;
    } else if (itemId == R.id.menu_qr) {
-      new IntentIntegrator(this).setCaptureActivity(QrActivity.class).initiateScan();
+      Intent intent =
+          new IntentIntegrator(this).setCaptureActivity(QrActivity.class).createScanIntent();
+      qrScannerLauncher.launch(intent);
      return true;
    } else if (itemId == R.id.menu_global_map) {
      WebxdcActivity.openMaps(this, 0);
@@ -475,38 +557,40 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
  }

  private void handleSaveAttachment() {
-    SaveAttachmentTask.showWarningDialog(this, (dialogInterface, i) -> {
-      if (StorageUtil.canWriteToMediaStore(this)) {
-        performSave();
-        return;
-      }
+    SaveAttachmentTask.showWarningDialog(
+        this,
+        (dialogInterface, i) -> {
+          if (StorageUtil.canWriteToMediaStore(this)) {
+            performSave();
+            return;
+          }

-      Permissions.with(this)
+          Permissions.with(this)
              .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
              .alwaysGrantOnSdk30()
              .ifNecessary()
              .withPermanentDenialDialog(getString(R.string.perm_explain_access_to_storage_denied))
              .onAllGranted(this::performSave)
              .execute();
-    });
+        });
  }

  private void performSave() {
-    ArrayList<Uri> uriList =  ShareUtil.getSharedUris(this);
+    ArrayList<Uri> uriList = ShareUtil.getSharedUris(this);
    Uri uri = uriList.get(0);
    String mimeType = PersistentBlobProvider.getMimeType(this, uri);
    String fileName = PersistentBlobProvider.getFileName(this, uri);
-    SaveAttachmentTask.Attachment[] attachments = new SaveAttachmentTask.Attachment[]{
-      new SaveAttachmentTask.Attachment(uri, mimeType, new Date().getTime(), fileName)
-    };
+    SaveAttachmentTask.Attachment[] attachments =
+        new SaveAttachmentTask.Attachment[] {
+          new SaveAttachmentTask.Attachment(uri, mimeType, new Date().getTime(), fileName)
+        };
    SaveAttachmentTask saveTask = new SaveAttachmentTask(this);
    saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, attachments);
    getOnBackPressedDispatcher().onBackPressed();
  }

  private void handleOpenpgp4fpr() {
-    if (getIntent() != null &&
-            Intent.ACTION_VIEW.equals(getIntent().getAction())) {
+    if (getIntent() != null && Intent.ACTION_VIEW.equals(getIntent().getAction())) {
      Uri uri = getIntent().getData();
      if (uri == null) {
        return;
@@ -539,7 +623,11 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
    int fwdAccId = getForwardedMessageAccountId(this);
    if (fwdAccId == dcContext.getAccountId() && dcContext.getChat(chatId).isSelfTalk()) {
      SendRelayedMessageUtil.immediatelyRelay(this, chatId);
-      Toast.makeText(this, DynamicTheme.getCheckmarkEmoji(this) + " " + getString(R.string.saved), Toast.LENGTH_SHORT).show();
+      Toast.makeText(
+              this,
+              DynamicTheme.getCheckmarkEmoji(this) + " " + getString(R.string.saved),
+              Toast.LENGTH_SHORT)
+          .show();
      handleResetRelaying();
      finish();
    } else {
@@ -584,25 +672,28 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit

  private void addDeviceMessages(boolean fromWelcome) {
    // update messages - for new messages, do not reuse or modify strings but create new ones.
-    // it is not needed to keep all past update messages, however, when deleted, also the strings should be deleted.
+    // it is not needed to keep all past update messages, however, when deleted, also the strings
+    // should be deleted.
    try {
      DcContext dcContext = DcHelper.getContext(this);
-      final String deviceMsgLabel = "update_2_33_1_android";
+      final String deviceMsgLabel = "update_2_46_0a_android";
      if (!dcContext.wasDeviceMsgEverAdded(deviceMsgLabel)) {
        DcMsg msg = null;
        if (!getIntent().getBooleanExtra(FROM_WELCOME, false)) {
          msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);

-          // InputStream inputStream = getResources().getAssets().open("device-messages/green-checkmark.jpg");
+          // InputStream inputStream =
+          // getResources().getAssets().open("device-messages/green-checkmark.jpg");
          // String outputFile = DcHelper.getBlobdirFile(dcContext, "green-checkmark", ".jpg");
          // Util.copy(inputStream, new FileOutputStream(outputFile));
          // msg.setFile(outputFile, "image/jpeg");

-          msg.setText(getString(R.string.update_2_33, "https://arcanechat.me/#contribute"));
+          msg.setText(getString(R.string.update_2_46ac, "https://arcanechat.me/#contribute", "https://i.delta.chat/#0A45953086F0C166D3BAF1D4BB2025496E4C2704&x=MVPi07rQBEmHO4FRb3brpwDe&j=n8mkKqu42WAKKUCx1bQOVh23&s=AM1YCd_2hKuiSiTEb-2177On&a=arcanechat%40arcanechat.me&n=ArcaneChat&b=ArcaneChat+Channel"));
        }
        dcContext.addDeviceMsg(deviceMsgLabel, msg);

-        if (Prefs.getStringPreference(this, Prefs.LAST_DEVICE_MSG_LABEL, "").equals(deviceMsgLabel)) {
+        if (Prefs.getStringPreference(this, Prefs.LAST_DEVICE_MSG_LABEL, "")
+            .equals(deviceMsgLabel)) {
          int deviceChatId = dcContext.getChatIdByContactId(DcContact.DC_CONTACT_ID_DEVICE);
          if (deviceChatId != 0) {
            dcContext.marknoticedChat(deviceChatId);
@@ -611,7 +702,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
        Prefs.setStringPreference(this, Prefs.LAST_DEVICE_MSG_LABEL, deviceMsgLabel);
      }

-    } catch(Exception e) {
+    } catch (Exception e) {
      e.printStackTrace();
    }
  }
@@ -621,12 +712,17 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
    refreshAvatar();
    refreshUnreadIndicator();
    refreshTitle();
-    conversationListFragment.loadChatlist();
+    conversationListFragment.loadChatlistAsync();
  }

  public void onDeleteProfile(int profileId) {
    deleteProfileId = profileId;
-    boolean result = ScreenLockUtil.applyScreenLock(this, getString(R.string.delete_account), getString(R.string.enter_system_secret_to_continue), REQUEST_CODE_CONFIRM_CREDENTIALS_DELETE_PROFILE);
+    boolean result =
+        ScreenLockUtil.applyScreenLock(
+            this,
+            getString(R.string.delete_account),
+            getString(R.string.enter_system_secret_to_continue),
+            deleteProfileLockLauncher);
    if (!result) {
      deleteProfile(profileId);
    }
@@ -654,38 +750,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
  }

  @Override
-  protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-    super.onActivityResult(requestCode, resultCode, data);
-    if (resultCode != RESULT_OK) return;
-
-    QrCodeHandler qrCodeHandler = new QrCodeHandler(this);
-    switch (requestCode) {
-      case IntentIntegrator.REQUEST_CODE:
-        IntentResult scanResult = IntentIntegrator.parseActivityResult(resultCode, data);
-        qrData = scanResult.getContents();
-        qrCodeHandler.handleQrData(qrData, SecurejoinSource.Scan, SecurejoinUiPath.QrIcon);
-        break;
-      case ScreenLockUtil.REQUEST_CODE_CONFIRM_CREDENTIALS:
-        // QrCodeHandler requested user authorization before adding a relay
-        // and it was granted, so proceed to add the relay
-        if (qrData != null) {
-          qrCodeHandler.addRelay(qrData);
-          qrData = null;
-        }
-        break;
-      case REQUEST_CODE_CONFIRM_CREDENTIALS_DELETE_PROFILE:
-        if (deleteProfileId != 0) {
-          deleteProfile(deleteProfileId);
-          deleteProfileId = 0;
-        }
-        break;
-      default:
-        break;
-    }
-  }
-
-  @Override
-  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+  public void onRequestPermissionsResult(
+      int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
  }
 }
@@ -20,48 +20,44 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.b44t.messenger.DcChat;
 import com.b44t.messenger.DcChatlist;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcLot;
-
+import java.lang.ref.WeakReference;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.util.ViewUtil;

-import java.lang.ref.WeakReference;
-
 /**
 * A CursorAdapter for building a list of conversation threads.
 *
 * @author Moxie Marlinspike
 */
-class ConversationListAdapter extends BaseConversationListAdapter<ConversationListAdapter.ViewHolder> {
+class ConversationListAdapter
+    extends BaseConversationListAdapter<ConversationListAdapter.ViewHolder> {

  private static final int MESSAGE_TYPE_SWITCH_ARCHIVE = 1;
-  private static final int MESSAGE_TYPE_THREAD         = 2;
-  private static final int MESSAGE_TYPE_INBOX_ZERO     = 3;
+  private static final int MESSAGE_TYPE_THREAD = 2;
+  private static final int MESSAGE_TYPE_INBOX_ZERO = 3;

-  private final WeakReference<Context>         context;
-  private @NonNull        DcContext            dcContext;
-  private @NonNull        DcChatlist           dcChatlist;
-  private final @NonNull  GlideRequests        glideRequests;
-  private final @NonNull  LayoutInflater       inflater;
-  private final @Nullable ItemClickListener    clickListener;
+  private final WeakReference<Context> context;
+  private @NonNull DcContext dcContext;
+  private @NonNull DcChatlist dcChatlist;
+  private final @NonNull GlideRequests glideRequests;
+  private final @NonNull LayoutInflater inflater;
+  private final @Nullable ItemClickListener clickListener;

  protected static class ViewHolder extends RecyclerView.ViewHolder {
-    public <V extends View & BindableConversationListItem> ViewHolder(final @NonNull V itemView)
-    {
+    public <V extends View & BindableConversationListItem> ViewHolder(final @NonNull V itemView) {
      super(itemView);
    }

    public BindableConversationListItem getItem() {
-      return (BindableConversationListItem)itemView;
+      return (BindableConversationListItem) itemView;
    }
  }

@@ -75,17 +71,17 @@ class ConversationListAdapter extends BaseConversationListAdapter<ConversationLi
    return dcChatlist.getChatId(i);
  }

-  ConversationListAdapter(@NonNull Context context,
-                          @NonNull GlideRequests glideRequests,
-                          @Nullable ItemClickListener clickListener)
-  {
+  ConversationListAdapter(
+      @NonNull Context context,
+      @NonNull GlideRequests glideRequests,
+      @Nullable ItemClickListener clickListener) {
    super();
-    this.context        = new WeakReference<>(context);
-    this.glideRequests  = glideRequests;
-    this.dcContext      = DcHelper.getContext(context);
-    this.dcChatlist     = new DcChatlist(0, 0);
-    this.inflater       = LayoutInflater.from(context);
-    this.clickListener  = clickListener;
+    this.context = new WeakReference<>(context);
+    this.glideRequests = glideRequests;
+    this.dcContext = DcHelper.getContext(context);
+    this.dcChatlist = new DcChatlist(0, 0);
+    this.inflater = LayoutInflater.from(context);
+    this.clickListener = clickListener;
    setHasStableIds(true);
  }

@@ -93,29 +89,37 @@ class ConversationListAdapter extends BaseConversationListAdapter<ConversationLi
  @Override
  public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
    if (viewType == MESSAGE_TYPE_SWITCH_ARCHIVE) {
-      final ConversationListItem item = (ConversationListItem)inflater.inflate(R.layout.conversation_list_item_view, parent, false);
+      final ConversationListItem item =
+          (ConversationListItem)
+              inflater.inflate(R.layout.conversation_list_item_view, parent, false);
      item.getLayoutParams().height = ViewUtil.dpToPx(54);
      item.findViewById(R.id.subject).setVisibility(View.GONE);
      item.findViewById(R.id.date).setVisibility(View.GONE);
-      item.setOnClickListener(v -> {
-        if (clickListener != null) clickListener.onSwitchToArchive();
-      });
+      item.setOnClickListener(
+          v -> {
+            if (clickListener != null) clickListener.onSwitchToArchive();
+          });

      return new ViewHolder(item);
    } else if (viewType == MESSAGE_TYPE_INBOX_ZERO) {
-      return new ViewHolder((ConversationListItemInboxZero)inflater.inflate(R.layout.conversation_list_item_inbox_zero, parent, false));
+      return new ViewHolder(
+          (ConversationListItemInboxZero)
+              inflater.inflate(R.layout.conversation_list_item_inbox_zero, parent, false));
    } else {
-      final ConversationListItem item = (ConversationListItem)inflater.inflate(R.layout.conversation_list_item_view,
-                                                                               parent, false);
+      final ConversationListItem item =
+          (ConversationListItem)
+              inflater.inflate(R.layout.conversation_list_item_view, parent, false);

-      item.setOnClickListener(view -> {
-        if (clickListener != null) clickListener.onItemClick(item);
-      });
+      item.setOnClickListener(
+          view -> {
+            if (clickListener != null) clickListener.onItemClick(item);
+          });

-      item.setOnLongClickListener(view -> {
-        if (clickListener != null) clickListener.onItemLongClick(item);
-        return true;
-      });
+      item.setOnLongClickListener(
+          view -> {
+            if (clickListener != null) clickListener.onItemLongClick(item);
+            return true;
+          });

      return new ViewHolder(item);
    }
@@ -130,7 +134,15 @@ class ConversationListAdapter extends BaseConversationListAdapter<ConversationLi

    DcChat chat = dcContext.getChat(dcChatlist.getChatId(i));
    DcLot summary = dcChatlist.getSummary(i, chat);
-    viewHolder.getItem().bind(DcHelper.getThreadRecord(context, summary, chat), dcChatlist.getMsgId(i), summary, glideRequests, batchSet, batchMode);
+    viewHolder
+        .getItem()
+        .bind(
+            DcHelper.getThreadRecord(context, summary, chat),
+            dcChatlist.getMsgId(i),
+            summary,
+            glideRequests,
+            batchSet,
+            batchMode);
  }

  @Override
@@ -139,7 +151,7 @@ class ConversationListAdapter extends BaseConversationListAdapter<ConversationLi

    if (chatId == DcChat.DC_CHAT_ID_ARCHIVED_LINK) {
      return MESSAGE_TYPE_SWITCH_ARCHIVE;
-    } else if(chatId == DcChat.DC_CHAT_ID_ALLDONE_HINT) {
+    } else if (chatId == DcChat.DC_CHAT_ID_ALLDONE_HINT) {
      return MESSAGE_TYPE_INBOX_ZERO;
    } else {
      return MESSAGE_TYPE_THREAD;
@@ -159,7 +171,9 @@ class ConversationListAdapter extends BaseConversationListAdapter<ConversationLi

  interface ItemClickListener {
    void onItemClick(ConversationListItem item);
+
    void onItemLongClick(ConversationListItem item);
+
    void onSwitchToArchive();
  }

@@ -169,7 +183,7 @@ class ConversationListAdapter extends BaseConversationListAdapter<ConversationLi
      return;
    }
    if (chatlist == null) {
-      dcChatlist =  new DcChatlist(0, 0);
+      dcChatlist = new DcChatlist(0, 0);
    } else {
      dcChatlist = chatlist;
      dcContext = DcHelper.getContext(context);
@@ -11,22 +11,19 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-
 import androidx.activity.OnBackPressedCallback;
-
 import com.b44t.messenger.DcChat;
-
 import org.thoughtcrime.securesms.connect.DcHelper;

 public class ConversationListArchiveActivity extends PassphraseRequiredActionBarActivity
-    implements ConversationListFragment.ConversationSelectedListener
-{
+    implements ConversationListFragment.ConversationSelectedListener {
  @Override
  protected void onCreate(Bundle icicle, boolean ready) {
    setContentView(R.layout.activity_conversation_list_archive);
    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
    if (isRelayingMessageContent(this)) {
-      getSupportActionBar().setTitle(isSharing(this) ? R.string.chat_share_with_title : R.string.forward_to);
+      getSupportActionBar()
+          .setTitle(isSharing(this) ? R.string.chat_share_with_title : R.string.forward_to);
      getSupportActionBar().setSubtitle(R.string.chat_archived_label);
    } else {
      getSupportActionBar().setTitle(R.string.chat_archived_label);
@@ -36,20 +33,25 @@ public class ConversationListArchiveActivity extends PassphraseRequiredActionBar
    bundle.putBoolean(ConversationListFragment.ARCHIVE, true);
    initFragment(R.id.fragment, new ConversationListFragment(), bundle);

-    getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
-      @Override
-      public void handleOnBackPressed() {
-        if (!isRelayingMessageContent(ConversationListArchiveActivity.this)) {
-          // Load the ConversationListActivity in case it's not existent for some reason
-          Intent intent = new Intent(ConversationListArchiveActivity.this, ConversationListActivity.class);
-          intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-          startActivity(intent);
-        }
+    getOnBackPressedDispatcher()
+        .addCallback(
+            this,
+            new OnBackPressedCallback(true) {
+              @Override
+              public void handleOnBackPressed() {
+                if (!isRelayingMessageContent(ConversationListArchiveActivity.this)) {
+                  // Load the ConversationListActivity in case it's not existent for some reason
+                  Intent intent =
+                      new Intent(
+                          ConversationListArchiveActivity.this, ConversationListActivity.class);
+                  intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                  startActivity(intent);
+                }

-        setEnabled(false);
-        getOnBackPressedDispatcher().onBackPressed();
-      }
-    });
+                setEnabled(false);
+                getOnBackPressedDispatcher().onBackPressed();
+              }
+            });
  }

  @Override
@@ -29,16 +29,15 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.b44t.messenger.DcChatlist;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEvent;
 import com.b44t.messenger.DcMsg;
-
+import java.util.Timer;
+import java.util.TimerTask;
 import org.thoughtcrime.securesms.ConversationListAdapter.ItemClickListener;
 import org.thoughtcrime.securesms.components.recyclerview.DeleteItemAnimator;
 import org.thoughtcrime.securesms.components.reminder.DozeReminder;
@@ -52,25 +51,21 @@ import org.thoughtcrime.securesms.util.ShareUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;

-import java.util.Timer;
-import java.util.TimerTask;
-
-
 public class ConversationListFragment extends BaseConversationListFragment
-        implements ItemClickListener, DcEventCenter.DcEventDelegate {
+    implements ItemClickListener, DcEventCenter.DcEventDelegate {
  public static final String ARCHIVE = "archive";
  public static final String RELOAD_LIST = "reload_list";

  private static final String TAG = ConversationListFragment.class.getSimpleName();

-  private RecyclerView                list;
-  private View                        emptyState;
-  private TextView                    emptySearch;
-  private final String                queryFilter  = "";
-  private boolean                     archive;
-  private Timer                       reloadTimer;
-  private boolean                     chatlistJustLoaded;
-  private boolean                     reloadTimerInstantly;
+  private RecyclerView list;
+  private View emptyState;
+  private TextView emptySearch;
+  private final String queryFilter = "";
+  private boolean archive;
+  private Timer reloadTimer;
+  private boolean chatlistJustLoaded;
+  private boolean reloadTimerInstantly;

  @Override
  public void onCreate(Bundle icicle) {
@@ -103,10 +98,10 @@ public class ConversationListFragment extends BaseConversationListFragment
  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle bundle) {
    final View view = inflater.inflate(R.layout.conversation_list_fragment, container, false);

-    list         = ViewUtil.findById(view, R.id.list);
-    fab          = ViewUtil.findById(view, R.id.fab);
-    emptyState   = ViewUtil.findById(view, R.id.empty_state);
-    emptySearch  = ViewUtil.findById(view, R.id.empty_search);
+    list = ViewUtil.findById(view, R.id.list);
+    fab = ViewUtil.findById(view, R.id.fab);
+    emptyState = ViewUtil.findById(view, R.id.empty_state);
+    emptySearch = ViewUtil.findById(view, R.id.empty_search);

    // add padding to avoid content hidden behind system bars
    ViewUtil.applyWindowInsets(list, true, archive, true, true);
@@ -145,22 +140,25 @@ public class ConversationListFragment extends BaseConversationListFragment

    updateReminders();

-    if (requireActivity().getIntent().getIntExtra(RELOAD_LIST, 0) == 1
-        && !chatlistJustLoaded) {
+    if (requireActivity().getIntent().getIntExtra(RELOAD_LIST, 0) == 1 && !chatlistJustLoaded) {
      loadChatlist();
      reloadTimerInstantly = false;
    }
    chatlistJustLoaded = false;

    reloadTimer = new Timer();
-    reloadTimer.scheduleAtFixedRate(new TimerTask() {
-      @Override
-      public void run() {
-        Util.runOnMain(() -> {
-          list.getAdapter().notifyDataSetChanged();
-        });
-      }
-    }, reloadTimerInstantly? 0 : 60 * 1000, 60 * 1000);
+    reloadTimer.scheduleAtFixedRate(
+        new TimerTask() {
+          @Override
+          public void run() {
+            Util.runOnMain(
+                () -> {
+                  list.getAdapter().notifyDataSetChanged();
+                });
+          }
+        },
+        reloadTimerInstantly ? 0 : 60 * 1000,
+        60 * 1000);
  }

  @Override
@@ -184,7 +182,8 @@ public class ConversationListFragment extends BaseConversationListFragment

  @SuppressLint({"StaticFieldLeak", "NewApi"})
  private void updateReminders() {
-    // by the time onPostExecute() is asynchronously run, getActivity() might return null, so get the activity here:
+    // by the time onPostExecute() is asynchronously run, getActivity() might return null, so get
+    // the activity here:
    Activity activity = requireActivity();
    new AsyncTask<Context, Void, Void>() {
      @Override
@@ -204,22 +203,29 @@ public class ConversationListFragment extends BaseConversationListFragment
      @Override
      protected void onPostExecute(Void result) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-          if (!Prefs.getBooleanPreference(activity, Prefs.ASKED_FOR_NOTIFICATION_PERMISSION, false)) {
+          if (!Prefs.getBooleanPreference(
+              activity, Prefs.ASKED_FOR_NOTIFICATION_PERMISSION, false)) {
            Prefs.setBooleanPreference(activity, Prefs.ASKED_FOR_NOTIFICATION_PERMISSION, true);
            Permissions.with(activity)
-              .request(Manifest.permission.POST_NOTIFICATIONS)
-              .ifNecessary()
-              .onAllGranted(() -> {
-                DozeReminder.maybeAskDirectly(activity);
-              })
-              .onAnyDenied(() -> {
-                final DcContext dcContext = DcHelper.getContext(activity);
-                DcMsg msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
-                msg.setText("\uD83D\uDC49 "+activity.getString(R.string.notifications_disabled)+" \uD83D\uDC48\n\n"
-                  +activity.getString(R.string.perm_explain_access_to_notifications_denied));
-                dcContext.addDeviceMsg("android.notifications-disabled", msg);
-              })
-              .execute();
+                .request(Manifest.permission.POST_NOTIFICATIONS)
+                .ifNecessary()
+                .onAllGranted(
+                    () -> {
+                      DozeReminder.maybeAskDirectly(activity);
+                    })
+                .onAnyDenied(
+                    () -> {
+                      final DcContext dcContext = DcHelper.getContext(activity);
+                      DcMsg msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
+                      msg.setText(
+                          "\uD83D\uDC49 "
+                              + activity.getString(R.string.notifications_disabled)
+                              + " \uD83D\uDC48\n\n"
+                              + activity.getString(
+                                  R.string.perm_explain_access_to_notifications_denied));
+                      dcContext.addDeviceMsg("android.notifications-disabled", msg);
+                    })
+                .execute();
          } else {
            DozeReminder.maybeAskDirectly(activity);
          }
@@ -233,7 +239,8 @@ public class ConversationListFragment extends BaseConversationListFragment
  private final Object loadChatlistLock = new Object();
  private boolean inLoadChatlist;
  private boolean needsAnotherLoad;
-  private void loadChatlistAsync() {
+
+  public void loadChatlistAsync() {
    synchronized (loadChatlistLock) {
      needsAnotherLoad = true;
      if (inLoadChatlist) {
@@ -243,24 +250,25 @@ public class ConversationListFragment extends BaseConversationListFragment
      inLoadChatlist = true;
    }

-    Util.runOnAnyBackgroundThread(() -> {
-      while(true) {
-        synchronized (loadChatlistLock) {
-          if (!needsAnotherLoad) {
-            inLoadChatlist = false;
-            return;
-          }
-          needsAnotherLoad = false;
-        }
+    Util.runOnAnyBackgroundThread(
+        () -> {
+          while (true) {
+            synchronized (loadChatlistLock) {
+              if (!needsAnotherLoad) {
+                inLoadChatlist = false;
+                return;
+              }
+              needsAnotherLoad = false;
+            }

-        Log.i(TAG, "executing debounced chatlist loading");
-        loadChatlist();
-        Util.sleep(100);
-      }
-    });
+            Log.i(TAG, "executing debounced chatlist loading");
+            loadChatlist();
+            Util.sleep(100);
+          }
+        });
  }

-  public void loadChatlist() {
+  private void loadChatlist() {
    int listflags = 0;
    if (archive) {
      listflags |= DcContext.DC_GCL_ARCHIVED_ONLY;
@@ -272,32 +280,36 @@ public class ConversationListFragment extends BaseConversationListFragment

    Context context = getContext();
    if (context == null) {
-      // can't load chat list at this time, see: https://github.com/deltachat/deltachat-android/issues/2012
+      // can't load chat list at this time, see:
+      // https://github.com/deltachat/deltachat-android/issues/2012
      Log.w(TAG, "Ignoring call to loadChatlist()");
      return;
    }
-    DcChatlist chatlist = DcHelper.getContext(context).getChatlist(listflags, queryFilter.isEmpty() ? null : queryFilter, 0);
+    DcChatlist chatlist =
+        DcHelper.getContext(context)
+            .getChatlist(listflags, queryFilter.isEmpty() ? null : queryFilter, 0);

-    Util.runOnMain(() -> {
-      if (chatlist.getCnt() <= 0 && TextUtils.isEmpty(queryFilter)) {
-        list.setVisibility(View.INVISIBLE);
-        emptyState.setVisibility(View.VISIBLE);
-        emptySearch.setVisibility(View.INVISIBLE);
-        fab.startPulse(3 * 1000);
-      } else if (chatlist.getCnt() <= 0 && !TextUtils.isEmpty(queryFilter)) {
-        list.setVisibility(View.INVISIBLE);
-        emptyState.setVisibility(View.GONE);
-        emptySearch.setVisibility(View.VISIBLE);
-        emptySearch.setText(getString(R.string.search_no_result_for_x, queryFilter));
-      } else {
-        list.setVisibility(View.VISIBLE);
-        emptyState.setVisibility(View.GONE);
-        emptySearch.setVisibility(View.INVISIBLE);
-        fab.stopPulse();
-      }
+    Util.runOnMain(
+        () -> {
+          if (chatlist.getCnt() <= 0 && TextUtils.isEmpty(queryFilter)) {
+            list.setVisibility(View.INVISIBLE);
+            emptyState.setVisibility(View.VISIBLE);
+            emptySearch.setVisibility(View.INVISIBLE);
+            fab.startPulse(3 * 1000);
+          } else if (chatlist.getCnt() <= 0 && !TextUtils.isEmpty(queryFilter)) {
+            list.setVisibility(View.INVISIBLE);
+            emptyState.setVisibility(View.GONE);
+            emptySearch.setVisibility(View.VISIBLE);
+            emptySearch.setText(getString(R.string.search_no_result_for_x, queryFilter));
+          } else {
+            list.setVisibility(View.VISIBLE);
+            emptyState.setVisibility(View.GONE);
+            emptySearch.setVisibility(View.INVISIBLE);
+            fab.stopPulse();
+          }

-      ((ConversationListAdapter)list.getAdapter()).changeData(chatlist);
-    });
+          ((ConversationListAdapter) list.getAdapter()).changeData(chatlist);
+        });
  }

  @Override
@@ -307,12 +319,12 @@ public class ConversationListFragment extends BaseConversationListFragment

  @Override
  protected void setFabVisibility(boolean isActionMode) {
-    fab.setVisibility((isActionMode || !archive)? View.VISIBLE : View.GONE);
+    fab.setVisibility((isActionMode || !archive) ? View.VISIBLE : View.GONE);
  }

  @Override
  public void onItemClick(ConversationListItem item) {
-      onItemClick(item.getChatId());
+    onItemClick(item.getChatId());
  }

  @Override
@@ -322,14 +334,15 @@ public class ConversationListFragment extends BaseConversationListFragment

  @Override
  public void onSwitchToArchive() {
-    ((ConversationSelectedListener)requireActivity()).onSwitchToArchive();
+    ((ConversationSelectedListener) requireActivity()).onSwitchToArchive();
  }

  @Override
  public void handleEvent(@NonNull DcEvent event) {
    final int accId = event.getAccountId();
    if (event.getId() == DcContext.DC_EVENT_CHAT_DELETED) {
-      DcHelper.getNotificationCenter(requireActivity()).removeNotifications(accId, event.getData1Int());
+      DcHelper.getNotificationCenter(requireActivity())
+          .removeNotifications(accId, event.getData1Int());
    } else if (accId != DcHelper.getContext(requireActivity()).getAccountId()) {
      Activity activity = getActivity();
      if (activity instanceof ConversationListActivity) {
@@ -352,7 +365,4 @@ public class ConversationListFragment extends BaseConversationListFragment
      loadChatlistAsync();
    }
  }
-
 }
-
-
@@ -30,17 +30,16 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.b44t.messenger.DcChat;
 import com.b44t.messenger.DcContact;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcLot;
 import com.b44t.messenger.DcMsg;
-
+import java.util.Collections;
+import java.util.Set;
 import org.thoughtcrime.securesms.components.AvatarView;
 import org.thoughtcrime.securesms.components.DeliveryStatusView;
 import org.thoughtcrime.securesms.components.FromTextView;
@@ -53,25 +52,22 @@ import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;

-import java.util.Collections;
-import java.util.Set;
-
 public class ConversationListItem extends RelativeLayout
-                                  implements BindableConversationListItem, Unbindable
-{
-  private final static Typeface  BOLD_TYPEFACE  = Typeface.create("sans-serif-medium", Typeface.NORMAL);
-  private final static Typeface  LIGHT_TYPEFACE = Typeface.create("sans-serif", Typeface.NORMAL);
+    implements BindableConversationListItem, Unbindable {
+  private static final Typeface BOLD_TYPEFACE =
+      Typeface.create("sans-serif-medium", Typeface.NORMAL);
+  private static final Typeface LIGHT_TYPEFACE = Typeface.create("sans-serif", Typeface.NORMAL);

-  private Set<Long>          selectedThreads;
-  private long               chatId;
-  private int                msgId;
-  private TextView           subjectView;
-  private FromTextView       fromView;
-  private TextView           dateView;
-  private TextView           archivedBadgeView;
-  private TextView           requestBadgeView;
+  private Set<Long> selectedThreads;
+  private long chatId;
+  private int msgId;
+  private TextView subjectView;
+  private FromTextView fromView;
+  private TextView dateView;
+  private TextView archivedBadgeView;
+  private TextView requestBadgeView;
  private DeliveryStatusView deliveryStatusIndicator;
-  private ImageView          unreadIndicator;
+  private ImageView unreadIndicator;

  private AvatarView avatar;

@@ -86,69 +82,72 @@ public class ConversationListItem extends RelativeLayout
  @Override
  protected void onFinishInflate() {
    super.onFinishInflate();
-    this.subjectView             = findViewById(R.id.subject);
-    this.fromView                = findViewById(R.id.from_text);
-    this.dateView                = findViewById(R.id.date);
+    this.subjectView = findViewById(R.id.subject);
+    this.fromView = findViewById(R.id.from_text);
+    this.dateView = findViewById(R.id.date);
    this.deliveryStatusIndicator = new DeliveryStatusView(findViewById(R.id.delivery_indicator));
-    this.avatar                  = findViewById(R.id.avatar);
-    this.archivedBadgeView       = findViewById(R.id.archived_badge);
-    this.requestBadgeView        = findViewById(R.id.request_badge);
-    this.unreadIndicator         = findViewById(R.id.unread_indicator);
+    this.avatar = findViewById(R.id.avatar);
+    this.archivedBadgeView = findViewById(R.id.archived_badge);
+    this.requestBadgeView = findViewById(R.id.request_badge);
+    this.unreadIndicator = findViewById(R.id.unread_indicator);

    ViewUtil.setTextViewGravityStart(this.fromView, getContext());
    ViewUtil.setTextViewGravityStart(this.subjectView, getContext());
  }

  @Override
-  public void bind(@NonNull ThreadRecord thread,
-                   int msgId,
-                   @NonNull DcLot dcSummary,
-                   @NonNull GlideRequests glideRequests,
-                   @NonNull Set<Long> selectedThreads,
-                   boolean batchMode)
-  {
+  public void bind(
+      @NonNull ThreadRecord thread,
+      int msgId,
+      @NonNull DcLot dcSummary,
+      @NonNull GlideRequests glideRequests,
+      @NonNull Set<Long> selectedThreads,
+      boolean batchMode) {
    bind(thread, msgId, dcSummary, glideRequests, selectedThreads, batchMode, null);
  }

-  public void bind(@NonNull ThreadRecord thread,
-                   int msgId,
-                   @NonNull DcLot dcSummary,
-                   @NonNull GlideRequests glideRequests,
-                   @NonNull Set<Long> selectedThreads,
-                   boolean batchMode,
-                   @Nullable String highlightSubstring)
-  {
-    this.selectedThreads  = selectedThreads;
-    Recipient recipient   = thread.getRecipient();
-    this.chatId           = thread.getThreadId();
-    this.msgId            = msgId;
+  public void bind(
+      @NonNull ThreadRecord thread,
+      int msgId,
+      @NonNull DcLot dcSummary,
+      @NonNull GlideRequests glideRequests,
+      @NonNull Set<Long> selectedThreads,
+      boolean batchMode,
+      @Nullable String highlightSubstring) {
+    this.selectedThreads = selectedThreads;
+    Recipient recipient = thread.getRecipient();
+    this.chatId = thread.getThreadId();
+    this.msgId = msgId;

-    int state       = dcSummary.getState();
+    int state = dcSummary.getState();

    if (highlightSubstring != null) {
      this.fromView.setText(getHighlightedSpan(recipient.getName(), highlightSubstring));
    } else {
-      this.fromView.setText(recipient, state!=DcMsg.DC_STATE_IN_FRESH);
+      this.fromView.setText(recipient, state != DcMsg.DC_STATE_IN_FRESH);
    }

-    subjectView.setVisibility(chatId == DcChat.DC_CHAT_ID_ARCHIVED_LINK? GONE : VISIBLE);
+    subjectView.setVisibility(chatId == DcChat.DC_CHAT_ID_ARCHIVED_LINK ? GONE : VISIBLE);
    this.subjectView.setText(thread.getDisplayBody());
-    this.subjectView.setTypeface(state==DcMsg.DC_STATE_IN_FRESH ? BOLD_TYPEFACE : LIGHT_TYPEFACE);
-    this.subjectView.setTextColor(state==DcMsg.DC_STATE_IN_FRESH ? ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_unread_color)
-                                                                 : ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_subject_color));
+    this.subjectView.setTypeface(state == DcMsg.DC_STATE_IN_FRESH ? BOLD_TYPEFACE : LIGHT_TYPEFACE);
+    this.subjectView.setTextColor(
+        state == DcMsg.DC_STATE_IN_FRESH
+            ? ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_unread_color)
+            : ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_subject_color));

    if (thread.getDate() > 0) {
      CharSequence date = DateUtils.getBriefRelativeTimeSpanString(getContext(), thread.getDate());
      dateView.setText(date);
-    }
-    else {
+    } else {
      dateView.setText("");
    }

    dateView.setCompoundDrawablesWithIntrinsicBounds(
-      thread.isSendingLocations()? R.drawable.ic_location_chatlist : 0, 0,
-      thread.getVisibility()==DcChat.DC_CHAT_VISIBILITY_PINNED? R.drawable.ic_pinned_chatlist : 0, 0
-    );
+        thread.isSendingLocations() ? R.drawable.ic_location_chatlist : 0, 0,
+        thread.getVisibility() == DcChat.DC_CHAT_VISIBILITY_PINNED
+                ? R.drawable.ic_pinned_chatlist
+                : 0,
+            0);

    setStatusIcons(thread, state);
    setBatchState(batchMode);
@@ -159,22 +158,22 @@ public class ConversationListItem extends RelativeLayout
    DcContact contact = recipient.getDcContact();
    avatar.setSeenRecently(contact != null && contact.wasSeenRecently());

-    DcChat dcChat = DcHelper.getContext(getContext()).getChat((int)chatId);
+    DcChat dcChat = DcHelper.getContext(getContext()).getChat((int) chatId);
    boolean isProtected = dcChat.isDeviceTalk() || dcChat.isSelfTalk();

    fromView.setCompoundDrawablesWithIntrinsicBounds(
-        thread.isMuted()? R.drawable.ic_volume_off_grey600_18dp : 0,
+        thread.isMuted() ? R.drawable.ic_volume_off_grey600_18dp : 0,
        0,
-        isProtected? R.drawable.ic_verified : 0,
+        isProtected ? R.drawable.ic_verified : 0,
        0);
  }

-  public void bind(@NonNull  DcContact     contact,
-                   @NonNull  GlideRequests glideRequests,
-                   @Nullable String        highlightSubstring)
-  {
+  public void bind(
+      @NonNull DcContact contact,
+      @NonNull GlideRequests glideRequests,
+      @Nullable String highlightSubstring) {
    this.selectedThreads = Collections.emptySet();
-    Recipient recipient  = new Recipient(getContext(), contact);
+    Recipient recipient = new Recipient(getContext(), contact);

    fromView.setText(getHighlightedSpan(contact.getDisplayName(), highlightSubstring));
    fromView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
@@ -191,14 +190,14 @@ public class ConversationListItem extends RelativeLayout
    avatar.setSeenRecently(contact.wasSeenRecently());
  }

-  public void bind(@NonNull  DcMsg         messageResult,
-                   @NonNull  GlideRequests glideRequests,
-                   @Nullable String        highlightSubstring)
-  {
+  public void bind(
+      @NonNull DcMsg messageResult,
+      @NonNull GlideRequests glideRequests,
+      @Nullable String highlightSubstring) {
    DcContext dcContext = DcHelper.getContext(getContext());
    DcContact sender = dcContext.getContact(messageResult.getFromId());
    this.selectedThreads = Collections.emptySet();
-    Recipient recipient  = new Recipient(getContext(), sender);
+    Recipient recipient = new Recipient(getContext(), sender);

    fromView.setText(recipient, true);
    fromView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
@@ -206,10 +205,10 @@ public class ConversationListItem extends RelativeLayout
    subjectView.setText(getHighlightedSpan(messageResult.getSummarytext(512), highlightSubstring));

    long timestamp = messageResult.getTimestamp();
-    if(timestamp>0) {
-      dateView.setText(DateUtils.getBriefRelativeTimeSpanString(getContext(), messageResult.getTimestamp()));
-    }
-    else {
+    if (timestamp > 0) {
+      dateView.setText(
+          DateUtils.getBriefRelativeTimeSpanString(getContext(), messageResult.getTimestamp()));
+    } else {
      dateView.setText("");
    }
    dateView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
@@ -224,8 +223,7 @@ public class ConversationListItem extends RelativeLayout
  }

  @Override
-  public void unbind() {
-  }
+  public void unbind() {}

  private void setBatchState(boolean batch) {
    setSelected(batch && selectedThreads.contains(chatId));
@@ -240,19 +238,15 @@ public class ConversationListItem extends RelativeLayout
  }

  private void setStatusIcons(ThreadRecord thread, int state) {
-    if (thread.getVisibility() == DcChat.DC_CHAT_VISIBILITY_ARCHIVED)
-    {
+    if (thread.getVisibility() == DcChat.DC_CHAT_VISIBILITY_ARCHIVED) {
      archivedBadgeView.setVisibility(View.VISIBLE);
      requestBadgeView.setVisibility(thread.isContactRequest() ? View.VISIBLE : View.GONE);
      deliveryStatusIndicator.setNone();
-    }
-    else if (thread.isContactRequest()) {
+    } else if (thread.isContactRequest()) {
      requestBadgeView.setVisibility(View.VISIBLE);
      archivedBadgeView.setVisibility(View.GONE);
      deliveryStatusIndicator.setNone();
-    }
-    else
-    {
+    } else {
      requestBadgeView.setVisibility(View.GONE);
      archivedBadgeView.setVisibility(View.GONE);

@@ -271,52 +265,53 @@ public class ConversationListItem extends RelativeLayout
      } else {
        deliveryStatusIndicator.setNone();
      }
-
-      if (state == DcMsg.DC_STATE_OUT_FAILED) {
-        deliveryStatusIndicator.setTint(Color.RED);
-      } else {
-        deliveryStatusIndicator.resetTint();
-      }
    }

    int unreadCount = thread.getUnreadCount();
-    if(unreadCount==0 || thread.isContactRequest()) {
+    if (unreadCount == 0 || thread.isContactRequest()) {
      unreadIndicator.setVisibility(View.GONE);
    } else {
      final int color;
-      if(thread.isMuted() || chatId == DcChat.DC_CHAT_ID_ARCHIVED_LINK){
-        color = getResources().getColor(ThemeUtil.isDarkTheme(getContext()) ? R.color.unread_count_muted_dark : R.color.unread_count_muted);
+      if (thread.isMuted() || chatId == DcChat.DC_CHAT_ID_ARCHIVED_LINK) {
+        color =
+            getResources()
+                .getColor(
+                    ThemeUtil.isDarkTheme(getContext())
+                        ? R.color.unread_count_muted_dark
+                        : R.color.unread_count_muted);
      } else {
-        final TypedArray attrs = getContext().obtainStyledAttributes(new int[] {
-                 R.attr.conversation_list_item_unreadcount_color,
-          });
+        final TypedArray attrs =
+            getContext()
+                .obtainStyledAttributes(
+                    new int[] {
+                      R.attr.conversation_list_item_unreadcount_color,
+                    });
        color = attrs.getColor(0, Color.BLACK);
      }
-      unreadIndicator.setImageDrawable(TextDrawable.builder()
-        .beginConfig()
-        .width(ViewUtil.dpToPx(getContext(), 24))
-        .height(ViewUtil.dpToPx(getContext(), 24))
-        .textColor(Color.WHITE)
-        .bold()
-        .endConfig()
-        .buildRound(String.valueOf(unreadCount), color));
+      unreadIndicator.setImageDrawable(
+          TextDrawable.builder()
+              .beginConfig()
+              .width(ViewUtil.dpToPx(getContext(), 24))
+              .height(ViewUtil.dpToPx(getContext(), 24))
+              .textColor(Color.WHITE)
+              .bold()
+              .endConfig()
+              .buildRound(String.valueOf(unreadCount), color));
      unreadIndicator.setVisibility(View.VISIBLE);
    }
  }

  private void setBgColor(ThreadRecord thread) {
    int bg = R.attr.conversation_list_item_background;
-    if (thread!=null && thread.getVisibility()==DcChat.DC_CHAT_VISIBILITY_PINNED) {
-        bg = R.attr.pinned_list_item_background;
+    if (thread != null && thread.getVisibility() == DcChat.DC_CHAT_VISIBILITY_PINNED) {
+      bg = R.attr.pinned_list_item_background;
    }
-    try (TypedArray ta = getContext().obtainStyledAttributes(new int[]{bg})) {
+    try (TypedArray ta = getContext().obtainStyledAttributes(new int[] {bg})) {
      ViewUtil.setBackground(this, ta.getDrawable(0));
    }
  }

-  private Spanned getHighlightedSpan(@Nullable String value,
-                                     @Nullable String highlight)
-  {
+  private Spanned getHighlightedSpan(@Nullable String value, @Nullable String highlight) {
    if (TextUtils.isEmpty(value)) {
      return new SpannableString("");
    }
@@ -327,11 +322,11 @@ public class ConversationListItem extends RelativeLayout
      return new SpannableString(value);
    }

-    String       normalizedValue  = value.toLowerCase(Util.getLocale());
-    String       normalizedTest   = highlight.toLowerCase(Util.getLocale());
+    String normalizedValue = value.toLowerCase(Util.getLocale());
+    String normalizedTest = highlight.toLowerCase(Util.getLocale());

-    Spannable spanned          = new SpannableString(value);
-    int       searchStartIndex = 0;
+    Spannable spanned = new SpannableString(value);
+    int searchStartIndex = 0;

    for (String token : normalizedTest.split(" ")) {
      if (token.trim().isEmpty()) continue;
@@ -343,7 +338,8 @@ public class ConversationListItem extends RelativeLayout

      if (start >= 0) {
        int end = Math.min(start + token.length(), spanned.length());
-        spanned.setSpan(new StyleSpan(Typeface.BOLD), start, end, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+        spanned.setSpan(
+            new StyleSpan(Typeface.BOLD), start, end, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
        searchStartIndex = end;
      }
    }
--- a/Show More
+++ b/Show More