add device message

Merge remote-tracking branch 'upstream/main'
Merge pull request #3684 from deltachat/prep-1.56.0
2026-07-03 14:05:24 +02:00 · 2025-03-15 23:09:28 +01:00 · 2025-03-15 22:05:36 +01:00 · 2025-03-15 19:12:26 +00:00 · 2025-03-15 19:08:27 +01:00 · 2025-03-15 18:52:59 +01:00
382 changed files with 7287 additions and 6006 deletions
@@ -0,0 +1,3 @@
+ko_fi: adbenitez
+liberapay: adbenitez
+custom: "https://arcanechat.me/#contribute"
@@ -1 +1 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
@@ -0,0 +1,22 @@
+version: 2
+mergeable:
+  - when: pull_request.*
+    name: "Changelog check"
+    validate:
+      - do: or
+        validate:
+        - do: description
+          must_include:
+            regex: '#skip-changelog'
+        - do: and
+          validate:
+            - do: dependent
+              changed:
+                file: '**/*.java'
+                required: ['CHANGELOG.md']
+    fail:
+      - do: checks
+        status: 'action_required'
+        payload:
+          title: CHANGELOG.md might need an update
+          summary: "Please update CHANGELOG.md or add #skip-changelog to the description"
@@ -51,7 +51,7 @@ jobs:
        run: ./gradlew --no-daemon -PABI_FILTER=armeabi-v7a assembleFossDebug

      - name: Upload APK
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: app-preview.apk
          path: 'build/outputs/apk/foss/debug/*.apk'
@@ -49,11 +49,12 @@ jobs:
      - name: Build APK
        run: |
          mkdir -p ~/.gradle
-          echo -n ${{ secrets.SIGNING_KEY }} | base64 -d >> ~/app.keystore
-          echo "DC_RELEASE_STORE_FILE=$HOME/app.keystore" >> ~/.gradle/gradle.properties
-          echo "DC_RELEASE_STORE_PASSWORD=${{ secrets.KEY_STORE_PASSWORD }}" >> ~/.gradle/gradle.properties
-          echo "DC_RELEASE_KEY_ALIAS=${{ secrets.ALIAS }}" >> ~/.gradle/gradle.properties
-          echo "DC_RELEASE_KEY_PASSWORD=${{ secrets.KEY_PASSWORD }}" >> ~/.gradle/gradle.properties
+          echo -n ${{ secrets.KEYSTORE_FILE }} | base64 -d >> ~/keystore.jks
+          echo "DC_RELEASE_STORE_FILE=$HOME/keystore.jks" >> ~/.gradle/gradle.properties
+          echo "DC_RELEASE_STORE_PASSWORD=${{ secrets.KEYSTORE_PASSWORD }}" >> ~/.gradle/gradle.properties
+          echo "DC_RELEASE_KEY_ALIAS_FDROID=${{ secrets.ALIAS_FDROID }}" >> ~/.gradle/gradle.properties
+          echo "DC_RELEASE_KEY_ALIAS_GPLAY=${{ secrets.ALIAS_GPLAY }}" >> ~/.gradle/gradle.properties
+          echo "DC_RELEASE_KEY_PASSWORD=${{ secrets.KEYSTORE_PASSWORD }}" >> ~/.gradle/gradle.properties
          ./gradlew assembleFossRelease
          rm build/outputs/apk/foss/release/*universal*
          ./gradlew assembleGplayRelease
@@ -63,7 +64,7 @@ jobs:
        uses: softprops/action-gh-release@v1
        with:
          token: "${{ secrets.GITHUB_TOKEN }}"
-          body: '[<img src="store/get-it-on-fdroid.png" alt="Get it on F-Droid" height="48">](https://f-droid.org/packages/chat.delta.lite) [<img src="store/get-it-on-IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height="48">](https://apt.izzysoft.de/fdroid/index/apk/chat.delta.lite) [<img src="store/get-it-on-apklis.png" alt="Disponible en Apklis" height="48">](https://www.apklis.cu/application/chat.delta.lite) [<img src="store/get-it-on-github.png" alt="Get it on GitHub" height="48">](https://github.com/ArcaneChat/android/releases/latest/download/ArcaneChat-gplay.apk)'
+          body: '[<img src="store/get-it-on-gplay.png" alt="Get it on Google Play" height="48">](https://play.google.com/store/apps/details?id=com.github.arcanechat) [<img src="store/get-it-on-fdroid.png" alt="Get it on F-Droid" height="48">](https://f-droid.org/packages/chat.delta.lite) [<img src="store/get-it-on-github.png" alt="Get it on GitHub" height="48">](https://github.com/ArcaneChat/android/releases/latest/download/ArcaneChat-gplay.apk)'
          prerelease: ${{ contains(github.event.ref, '-beta') }}
          fail_on_unmatched_files: true
          files: build/outputs/apk/foss/release/*.apk
@@ -1,4 +1,114 @@
-# ArcaneChat Android Changelog
+# Delta Chat Android Changelog
+
+## v1.56.0
+2025-03
+
+* allow to edit messages
+* allow to delete messages for everyone
+* add mute option "8 hours"
+* add menu option to easily save/unsave selected message
+* improve deletion confirmation for "Device Messages"
+* remove dangerous encryption options
+* always paste as plain text in message draft area
+* some small bug fixes and updated translations
+* update to core 1.157.2
+
+## v1.54.4
+2025-03
+
+* allow better avatar (profile picture) quality
+* remove notifications from chat that was deleted from other device
+* when a chat is deleted, also delete its messages from server
+* avoid freezing when opening the app for the first time after install
+* avoid crash when adding chat shortcut to home screen
+* some small bug fixes and updated translations
+* update to core 1.156.3
+
+## v1.54.3
+2025-03
+
+* allow to add any chat to the home screen
+* update "forward message" icon and organize the messages actions bar
+* do not allow non-members to change ephemeral timer settings of groups
+* properly display padlock when the message is not sent over the network
+* sync message deletion to other devices
+* sync chat deletion across devices
+* Show sender in "Saved Messages"
+* allow scanning multiple QR-invitation codes without needing to wait for completion to scan the next one
+* when reactions are seen in one device, remove notification from your other devices
+* don't disturb with notification when someone leave a group
+* detect incompatible profiles from newer app version when importing them
+* prepare the app for receiving edited messages
+* prepare the app for receiving message deletion requests
+* do some small bug fixes
+* update translations
+* update to core 1.156.2
+
+## v1.54.0
+2025-02
+
+* enhanced "Saved Messages" feature, now when forwarding a message to "Saved Messages" chat, it retains the sender information and a button to jump to the original message
+* Saved messages are marked by a bookmark sign
+* improve explanation when blocking a contact
+* improve wording in empty "apps" and "files" tabs in chat media screen
+* remove deprecated/legacy built-in "half-camera"
+* UI improvement: keep avatars aligned to message bubble when message has reactions
+* fix problems when opening attachments in external apps
+* fix a bug with some big images appearing as blank/transparent
+* some other small bug fixes
+* update translations
+* update to core 1.155.4
+
+## v1.52.1
+2025-01
+
+* the app now requires less storage on your SD card by deduplicating newly received/sent files
+* some small bug fixes
+* update translations
+* update to core 1.155.1
+
+## v1.52.0
+2025-01
+
+* new group consistency algorithm
+* fix: don't show animated .webp stickers as static stickers
+* fix the chat shortcuts (created via long-press in launcher) to properly support multi-profile
+* fix some small bugs in certain android versions and special situations
+* avoid the app freezing in slow phones in some situations
+* improve menu in the help screen
+* update translations
+* update to core 1.155.0
+
+## v1.50.5
+2025-01
+
+* fix push-notifications handling for certain devices where it was not working correctly
+* update translations
+* using core 1.153.0
+
+## v1.50.4
+2025-01
+
+* properly send as animated stickers GIF files selected from keyboard
+* improve emoji picker in landscape mode and when changing from landscape to portrait
+* avoid crash when receiving push notifications if the user restricted the app from working in background
+* improve UI when attaching a file or image to easily recognize it is attached but not sent yet
+* avoid slow loading of in-chat apps in some devices when quickly re-opening an app after closing it
+* allow to select multiple images at once in the media picker via "Gallery" button
+* mark holiday notice messages as bot-generated
+* don't mark contacts as bot when receiving location-only and sync messages
+* prefer to encrypt even if peers have their preference to "no preference"
+* start ephemeral messages timers when the chat is archived or noticed
+* several bug fixes and updated translations
+* update to core 1.153.0
+
+## v1.50.3
+2024-12
+
+* Add in-chat apps picker to attachments options
+* Notify replies and reactions to your messages in muted chats (can be disabled in settings)
+* Cache HTTP GET requests (ex. when loading images from HTML messages)
+* update to core 1.152.0

 ## v1.50.2
 2024-12
@@ -1,10 +1,9 @@
 ## ArcaneChat Android Client

-A [Delta Chat](https://delta.chat/) client for Android.
+A [Delta Chat](https://delta.chat/) client for Android. Learn more at: https://arcanechat.me

+[<img src="store/get-it-on-gplay.png" alt="Get it on Google Play" height="48">](https://play.google.com/store/apps/details?id=com.github.arcanechat)
 [<img src="store/get-it-on-fdroid.png" alt="Get it on F-Droid" height="48">](https://f-droid.org/packages/chat.delta.lite)
-[<img src="store/get-it-on-IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height="48">](https://apt.izzysoft.de/fdroid/index/apk/chat.delta.lite)
-[<img src="store/get-it-on-apklis.png" alt="Disponible en Apklis" height="48">](https://www.apklis.cu/application/chat.delta.lite)
 [<img src="store/get-it-on-github.png" alt="Get it on GitHub" height="48">](https://github.com/ArcaneChat/android/releases/latest/download/ArcaneChat-gplay.apk)


@@ -25,7 +25,7 @@ the "update-core-and-stuff-DATE" PR can be merged without review
 the following steps are done in a PR called `prep-VERSION` (no leading "v"):

 3. a) update `CHANGELOG.md`
-      from <https://github.com/deltachat/deltachat-core-rust/blob/main/CHANGELOG.md>
+      from <https://github.com/chatmail/core/blob/main/CHANGELOG.md>
      and <https://github.com/deltachat/deltachat-android/pulls?q=is%3Apr+is%3Aclosed+sort%3Aupdated-desc>.
      do not just copy and avoid technical terms.
      the changelog is for the end user and shall show impacts form that angle.
@@ -114,7 +114,7 @@ This may take some days.

 on <https://developer.amazon.com/dashboard>:

-12. a) for "Delta Chat", select "Add upcoming version" on the left
+12. a) click "App List", for "Delta Chat", select "Add upcoming version" on the left
    b) at "Step 1 / Existing file(s)" hit "Replace", upload the APK from above
    c) on the "Step 1" page, add "Release notes" from CHANGELOG.md, hit "Next"
    d) on "Step 2" and "Step 3" pages, hit "Next"
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.android.application' version '8.1.4'
+    id 'com.android.application' version '8.5.2'
    id 'com.google.gms.google-services' version '4.4.1'
 }

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

    defaultConfig {
-        versionCode 30000699
-        versionName "1.50.3"
+        versionCode 30000716
+        versionName "1.56.0"

        applicationId "chat.delta.lite"
        multiDexEnabled true
@@ -87,15 +87,45 @@ android {
                storeFile file(DC_DEBUG_STORE_FILE )
            }
        }
-        release {
+        releaseFdroid {
            // can be defined at `~/.gradle/gradle.properties` or at "Build/Generate signed APK"
            if(project.hasProperty("DC_RELEASE_STORE_FILE")) {
                storeFile file(DC_RELEASE_STORE_FILE)
                storePassword DC_RELEASE_STORE_PASSWORD
-                keyAlias DC_RELEASE_KEY_ALIAS
+                keyAlias DC_RELEASE_KEY_ALIAS_FDROID
                keyPassword DC_RELEASE_KEY_PASSWORD
            }
        }
+        releaseApk {
+            // can be defined at `~/.gradle/gradle.properties` or at "Build/Generate signed APK"
+            if(project.hasProperty("DC_RELEASE_STORE_FILE")) {
+                storeFile file(DC_RELEASE_STORE_FILE)
+                storePassword DC_RELEASE_STORE_PASSWORD
+                keyAlias DC_RELEASE_KEY_ALIAS_GPLAY
+                keyPassword DC_RELEASE_KEY_PASSWORD
+            }
+        }
+        releaseBundle {
+            if(project.hasProperty("DC_BUNDLE_STORE_FILE")) {
+                storeFile file(DC_BUNDLE_STORE_FILE)
+                storePassword DC_BUNDLE_STORE_PASSWORD
+                keyAlias DC_BUNDLE_KEY_ALIAS
+                keyPassword DC_BUNDLE_STORE_PASSWORD
+            }
+        }
+    }
+
+    productFlavors {
+        foss {
+            dimension "none"
+            buildConfigField "boolean", "USE_PLAY_SERVICES", "false"
+        }
+        gplay {
+            dimension "none"
+            apply plugin: "com.google.gms.google-services"
+            buildConfigField "boolean", "USE_PLAY_SERVICES", "true"
+            applicationId "com.github.arcanechat"
+        }
    }

    buildTypes {
@@ -114,23 +144,12 @@ android {
            // nb: it is highly recommended to use the same settings in debug+release -
            // otherwise problems might be noticed delayed only
            minifyEnabled true
-            signingConfig signingConfigs.release
+            productFlavors.foss.signingConfig signingConfigs.releaseFdroid
+            productFlavors.gplay.signingConfig signingConfigs.releaseApk
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
    }

-    productFlavors {
-        foss {
-            dimension "none"
-            buildConfigField "boolean", "USE_PLAY_SERVICES", "false"
-        }
-        gplay {
-            dimension "none"
-            apply plugin: "com.google.gms.google-services"
-            buildConfigField "boolean", "USE_PLAY_SERVICES", "true"
-        }
-    }
-
    if(!project.hasProperty("ABI_FILTER")) {
      splits {
        abi {
@@ -190,7 +209,7 @@ dependencies {
    implementation 'com.airbnb.android:lottie:4.2.2' // Lottie animations support.

    implementation 'androidx.sharetarget:sharetarget:1.2.0'
-    implementation 'androidx.webkit:webkit:1.11.0'
+    implementation 'androidx.webkit:webkit:1.12.1'
    implementation 'androidx.multidex:multidex:2.0.1'
    implementation 'androidx.appcompat:appcompat:1.7.0'
    implementation 'com.google.android.material:material:1.12.0'
@@ -210,22 +229,21 @@ dependencies {
    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-ui:2.19.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    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
    implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.1' // used as JSON library
-    implementation 'com.google.code.gson:gson:2.9.1' // used as JSON library. Don't upgrade to 2.10.1: https://github.com/deltachat/deltachat-android/pull/2610
+    implementation 'com.google.code.gson:gson:2.12.1' // used as JSON library.
    implementation "me.leolin:ShortcutBadger:1.1.16" // display messagecount on the home screen icon.
    implementation 'com.jpardogo.materialtabstrip:library:1.0.9' // used in the emoji selector for the tab selection.
    implementation 'com.github.chrisbanes:PhotoView:2.1.3' // does the zooming on photos / media
-    implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.25.0' // APNG & animated webp support.
+    implementation 'com.github.penfeizhou.android.animation:awebp:3.0.2' // animated webp support.
    implementation 'com.caverock:androidsvg-aar:1.4' // SVG support.
    implementation 'com.github.bumptech.glide:glide:4.12.0'
    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
-    annotationProcessor 'androidx.annotation:annotation:1.8.2'
+    annotationProcessor 'androidx.annotation:annotation:1.9.1'
    implementation 'com.makeramen:roundedimageview:2.1.0' // crops the avatars to circles
    implementation 'com.pnikosis:materialish-progress:1.5' // used only in the "Progress Wheel" in Share Activity.
-    implementation 'com.soundcloud.android:android-crop:1.0.1@aar' // used for profile and group avatar selection in Android SDK<19
    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
@@ -234,13 +252,12 @@ dependencies {
    }
    implementation 'com.annimon:stream:1.1.8' // brings future java streams api to SDK Version < 24

-    implementation 'com.getkeepsafe.relinker:relinker:1.4.4' // needed to avoid safe-content-resolver-v14 trying to fetch older non-existing version
    // Replacement for ContentResolver
    // that protects against the Surreptitious Sharing attack.
    // <https://github.com/cketti/SafeContentResolver>
-    implementation 'de.cketti.safecontentresolver:safe-content-resolver-v14:1.0.0'
+    implementation 'de.cketti.safecontentresolver:safe-content-resolver-v21:1.0.0'

-    gplayImplementation('com.google.firebase:firebase-messaging:24.0.0') { // for PUSH notifications
+    gplayImplementation('com.google.firebase:firebase-messaging:24.1.0') { // for PUSH notifications
        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'
@@ -254,7 +271,7 @@ dependencies {
    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.1'
    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'

-    androidTestImplementation 'androidx.test:runner:1.6.1'
+    androidTestImplementation 'androidx.test:runner:1.6.2'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.6.1'
    androidTestImplementation 'androidx.test:rules:1.6.1'
@@ -1,35 +1,37 @@
-ArcaneChat is a decentralized and secure messenger app that is compatible with the existing e-mail infrastructure.
+ArcaneChat is a decentralized and secure instant messenger that is easy to use for friends and family.

-Some features at a glance:
+• Anonymous. Instant onboarding without a phone number, e-mail or other private data.

-💬 Reliable instant messaging with multi-profile and multi-device support.
+• Flexible. Supports multiple chat profiles and is easy to setup on multiple devices.

-⚡️ Sign-up easily using secure fast chatmail servers. You don’t need a phone number or any private data.
+• Extensible. Use mini-apps in chats like shopping lists, calendars or games.

-📧 Alternatively, use your existing classic e-mail address to read your inbox as chats.
+• Reliable. Works under bad and adverserial network conditions.

-🎮 Interactive mini-apps in chats for gaming and collaboration.
+• Secure. Audited End-to-End encryption safe against network and server attacks.

-🔒 Audited end-to-end encryption safe against network and server attacks.
+• Sovereign. Can be run with your own e-mail address or server.

 ArcaneChat is a Delta Chat client and was created with a focus on usability, good user experience, and saving data plan. Also the app usually experiments with new features that eventually might get added to the official Delta Chat client.

 <b>Main differences with official Delta Chat client:</b>

 <ul>
-<li>Basic markdown support (bold, italic, strike, etc.)</li>
+<li>Support for some markdown styles in text messages (bold, italic, strike, etc.)</li>
 <li>Support for displaying Telegram's animated stickers (.tgs files)</li>
 <li>Support for SVG images previews</li>
 <li>Multiple color themes/skins</li>
-<li>It is possible to disable accounts to completely disconnect them to save data/bandwidth</li>
+<li>It is possible to disable profiles to completely disconnect them saving data/bandwidth</li>
+<li>You can easily see the connection status of all your profiles in the profile switcher</li>
 <li>A videochat instance is set by default</li>
-<li>Replies to your messages in muted groups trigger notifications</li>
-<li>Location streaming feature enabled by default and extra option to share location for 12 hours</li>
+<li>Extra option to share location for 12 hours</li>
+<li>Clicking on a message with a POI location, will open the POI on the map</li>
+<li>Last-seen status of contacts is shown in your contact list, like in WhatsApp, Telegram, etc.</li>
 <li>Videos are played in loop, useful for short GIF videos</li>
 <li>Verified icon is shown in the chat list for the "Device Messages" chat</li>
 <li>Voice messages have more aggressive compression in "worse quality" mode to save data plan</li>
 <li>Automatic download of messages limited to 640KB by default</li>
-<li>Account's display name is always shown in the app's title bar instead of the name of the app</li>
+<li>Profile's display name is always shown in the app's title bar instead of the name of the app</li>
 <li>Your avatar is visible to other users in Mailing Lists</li>
 <li>Can be selected as app to open .xdc files</li>
 <li>For mini-apps developers: there are some extra features in the WebXDC API, check https://github.com/ArcaneChat/android/#webxdc</li>
@@ -3,15 +3,15 @@
    "android": {
      "inputs": {
        "devshell": "devshell",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1720988215,
-        "narHash": "sha256-nQ0Zx0vAWJo0IOGNFjCOdIkDSgOpMa//GalR8tbTl3A=",
+        "lastModified": 1733948466,
+        "narHash": "sha256-o/uq/tU458Ykudi8Zk3sRga5iazkuSczt9wDOCUDOSU=",
        "owner": "tadfisher",
        "repo": "android-nixpkgs",
-        "rev": "5a052c62cdb51b210bc0717177d5bd014cba3df1",
+        "rev": "0bf99ffaea6a7c0948ae10cf2e40c2905e4e4d6b",
        "type": "github"
      },
      "original": {
@@ -22,18 +22,17 @@
    },
    "devshell": {
      "inputs": {
-        "flake-utils": "flake-utils",
        "nixpkgs": [
          "android",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1717408969,
-        "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
+        "lastModified": 1728330715,
+        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
+        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
        "type": "github"
      },
      "original": {
@@ -47,11 +46,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@@ -65,29 +64,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@@ -98,11 +79,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1720768451,
-        "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
+        "lastModified": 1733759999,
+        "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
+        "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
        "type": "github"
      },
      "original": {
@@ -114,11 +95,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1723221148,
-        "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
+        "lastModified": 1733749988,
+        "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6",
+        "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68",
        "type": "github"
      },
      "original": {
@@ -130,11 +111,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1718428119,
-        "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=",
+        "lastModified": 1728538411,
+        "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5",
+        "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
        "type": "github"
      },
      "original": {
@@ -147,7 +128,7 @@
    "root": {
      "inputs": {
        "android": "android",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
        "nixpkgs": "nixpkgs_2",
        "rust-overlay": "rust-overlay"
      }
@@ -157,11 +138,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1723429325,
-        "narHash": "sha256-4x/32xTCd+xCwFoI/kKSiCr5LQA2ZlyTRYXKEni5HR8=",
+        "lastModified": 1733970833,
+        "narHash": "sha256-sPEKtSaZk2CtfF9cdhtbY93S6qGq+d2PKI1fcoDfDaI=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "65e3dc0fe079fe8df087cd38f1fe6836a0373aad",
+        "rev": "f7f4c59ccdf1bec3f1547d27398e9589aa94e3e8",
        "type": "github"
      },
      "original": {
@@ -199,21 +180,6 @@
        "repo": "default",
        "type": "github"
      }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
    }
  },
  "root": "root",
@@ -15,20 +15,22 @@
        pkgs = import nixpkgs { inherit system overlays; };
        android-sdk = android.sdk.${system} (sdkPkgs:
          with sdkPkgs; [
-            build-tools-33-0-1
+            build-tools-34-0-0
            cmdline-tools-latest
-            ndk-bundle
            platform-tools
            platforms-android-34
-            ndk-27-0-11902837
+            ndk-27-2-12479018
          ]);
        rust-version = pkgs.lib.removeSuffix "\n"
          (builtins.readFile ./scripts/rust-toolchain);
-      in {
+      in
+      {
+        formatter = pkgs.nixpkgs-fmt;
+
        devShells.default = pkgs.mkShell {
          ANDROID_SDK_ROOT = "${android-sdk}/share/android-sdk";
          ANDROID_NDK_ROOT =
-            "${android-sdk}/share/android-sdk/ndk/27.0.11902837";
+            "${android-sdk}/share/android-sdk/ndk/27.2.12479018";
          buildInputs = [
            android-sdk
            pkgs.openjdk17
@@ -28,7 +28,7 @@
      "client_info": {
        "mobilesdk_app_id": "1:922391085500:android:6f54e2c4e49405673e2bb9",
        "android_client_info": {
-          "package_name": "chat.delta.lite.beta"
+          "package_name": "com.github.arcanechat.beta"
        }
      },
      "oauth_client": [],
@@ -47,7 +47,7 @@
      "client_info": {
        "mobilesdk_app_id": "1:922391085500:android:aff82fbc40c8172e3e2bb9",
        "android_client_info": {
-          "package_name": "chat.delta.lite"
+          "package_name": "com.github.arcanechat"
        }
      },
      "oauth_client": [],
@@ -66,7 +66,7 @@
      "client_info": {
        "mobilesdk_app_id": "1:922391085500:android:92b4cf12669cc2083e2bb9",
        "android_client_info": {
-          "package_name": "com.github.arcanechat"
+          "package_name": "chat.delta.lite"
        }
      },
      "oauth_client": [],
@@ -85,7 +85,7 @@
      "client_info": {
        "mobilesdk_app_id": "1:922391085500:android:228a205b8aa2bacc3e2bb9",
        "android_client_info": {
-          "package_name": "com.github.arcanechat.beta"
+          "package_name": "chat.delta.lite.beta"
        }
      },
      "oauth_client": [],
@@ -1,6 +1,5 @@
 android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
-android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx4608m
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -231,12 +231,6 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcAccounts_backgroundFetch(JNIEnv *en
 }


-JNIEXPORT jint Java_com_b44t_messenger_DcAccounts_addAccount(JNIEnv *env, jobject obj)
-{
-    return dc_accounts_add_account(get_dc_accounts(env, obj));
-}
-
-
 JNIEXPORT jint Java_com_b44t_messenger_DcAccounts_migrateAccount(JNIEnv *env, jobject obj, jstring dbfile)
 {
    CHAR_REF(dbfile);
@@ -659,6 +653,14 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcContext_getMsgInfo(JNIEnv *env, jobj
 }


+JNIEXPORT void Java_com_b44t_messenger_DcContext_sendEditRequest(JNIEnv *env, jobject obj, jint msg_id, jstring text)
+{
+    CHAR_REF(text);
+        dc_send_edit_request(get_dc_context(env, obj), msg_id, textPtr);
+    CHAR_UNREF(text);
+}
+
+
 JNIEXPORT jstring Java_com_b44t_messenger_DcContext_getMsgHtml(JNIEnv *env, jobject obj, jint msg_id)
 {
    char* temp = dc_get_msg_html(get_dc_context(env, obj), msg_id);
@@ -683,6 +685,15 @@ JNIEXPORT void Java_com_b44t_messenger_DcContext_deleteMsgs(JNIEnv *env, jobject
 }


+JNIEXPORT void Java_com_b44t_messenger_DcContext_sendDeleteRequest(JNIEnv *env, jobject obj, jintArray msg_ids)
+{
+    int msg_ids_cnt = 0;
+    uint32_t* msg_ids_ptr = jintArray2uint32Pointer(env, msg_ids, &msg_ids_cnt);
+        dc_send_delete_request(get_dc_context(env, obj), msg_ids_ptr, msg_ids_cnt);
+    free(msg_ids_ptr);
+}
+
+
 JNIEXPORT void Java_com_b44t_messenger_DcContext_forwardMsgs(JNIEnv *env, jobject obj, jintArray msg_ids, jint chat_id)
 {
    int msg_ids_cnt = 0;
@@ -691,6 +702,13 @@ JNIEXPORT void Java_com_b44t_messenger_DcContext_forwardMsgs(JNIEnv *env, jobjec
    free(msg_ids_ptr);
 }

+JNIEXPORT void Java_com_b44t_messenger_DcContext_saveMsgs(JNIEnv *env, jobject obj, jintArray msg_ids)
+{
+    int msg_ids_cnt = 0;
+    uint32_t* msg_ids_ptr = jintArray2uint32Pointer(env, msg_ids, &msg_ids_cnt);
+        dc_save_msgs(get_dc_context(env, obj), msg_ids_ptr, msg_ids_cnt);
+    free(msg_ids_ptr);
+}

 JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_resendMsgs(JNIEnv *env, jobject obj, jintArray msg_ids)
 {
@@ -702,12 +720,6 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_resendMsgs(JNIEnv *env, job
 }


-JNIEXPORT jint Java_com_b44t_messenger_DcContext_prepareMsg(JNIEnv *env, jobject obj, jint chat_id, jobject msg)
-{
-    return dc_prepare_msg(get_dc_context(env, obj), chat_id, get_dc_msg(env, msg));
-}
-
-
 JNIEXPORT jint Java_com_b44t_messenger_DcContext_sendMsg(JNIEnv *env, jobject obj, jint chat_id, jobject msg)
 {
    return dc_send_msg(get_dc_context(env, obj), chat_id, get_dc_msg(env, msg));
@@ -1370,12 +1382,6 @@ JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getId(JNIEnv *env, jobject obj)
    return dc_msg_get_id(get_dc_msg(env, obj));
 }

-
-JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_isOutgoing(JNIEnv *env, jobject obj)
-{
-    return (jboolean)(dc_msg_is_outgoing(get_dc_msg(env, obj))!=0);
-}
-
 JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getSenderColor(JNIEnv *env, jobject obj)
 {
  return dc_msg_get_sender_color(get_dc_msg(env, obj));
@@ -1588,12 +1594,6 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_isForwarded(JNIEnv *env, jobjec
 }


-JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_isIncreation(JNIEnv *env, jobject obj)
-{
-    return dc_msg_is_increation(get_dc_msg(env, obj))!=0;
-}
-
-
 JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_isInfo(JNIEnv *env, jobject obj)
 {
    return dc_msg_is_info(get_dc_msg(env, obj))!=0;
@@ -1660,12 +1660,35 @@ JNIEXPORT void Java_com_b44t_messenger_DcMsg_setHtml(JNIEnv *env, jobject obj, j
 }


-JNIEXPORT void Java_com_b44t_messenger_DcMsg_setFile(JNIEnv *env, jobject obj, jstring file, jstring filemime)
+JNIEXPORT void Java_com_b44t_messenger_DcMsg_forceSticker(JNIEnv *env, jobject obj)
+{
+    dc_msg_force_sticker(get_dc_msg(env, obj));
+}
+
+
+JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getPOILocation(JNIEnv *env, jobject obj)
+{
+    char* temp = dc_msg_get_poi_location(get_dc_msg(env, obj));
+        jstring ret = JSTRING_NEW(temp);
+    dc_str_unref(temp);
+    return ret;
+}
+
+
+JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_isEdited(JNIEnv *env, jobject obj)
+{
+    return dc_msg_is_edited(get_dc_msg(env, obj));
+}
+
+
+JNIEXPORT void Java_com_b44t_messenger_DcMsg_setFileAndDeduplicate(JNIEnv *env, jobject obj, jstring file, jstring name, jstring filemime)
 {
    CHAR_REF(file);
+    CHAR_REF(name);
    CHAR_REF(filemime);
-        dc_msg_set_file(get_dc_msg(env, obj), filePtr, filemimePtr);
+    dc_msg_set_file_and_deduplicate(get_dc_msg(env, obj), filePtr, namePtr, filemimePtr);
    CHAR_UNREF(filemime);
+    CHAR_UNREF(name);
    CHAR_UNREF(file);
 }

@@ -1714,6 +1737,15 @@ JNIEXPORT jlong Java_com_b44t_messenger_DcMsg_getParentCPtr(JNIEnv *env, jobject
    return (jlong)dc_msg_get_parent(get_dc_msg(env, obj));
 }

+JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getOriginalMsgId(JNIEnv *env, jobject obj)
+{
+    return (jint)dc_msg_get_original_msg_id(get_dc_msg(env, obj));
+}
+
+JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getSavedMsgId(JNIEnv *env, jobject obj)
+{
+    return (jint)dc_msg_get_saved_msg_id(get_dc_msg(env, obj));
+}

 JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getError(JNIEnv *env, jobject obj)
 {
@@ -0,0 +1 @@
+Schreibe Nachrichten mit E-Mails. Retro, Offen. Privatsphäre im Design.
@@ -1,7 +0,0 @@
- nuovo inserimento: puoi creare un nuovo profilo con un tocco su "Crea Nuovo Profilo" - oppure utilizzare un accesso esistente o la configurazione del secondo dispositivo come al solito
-i contatti possono essere allegati come "Schede" in "Allega/Contatto"; quando il destinatario tocca le carte, è possibile stabilire la crittografia end-to-end garantita
- aggiungi contatti manualmente in "Nuova Chat / Nuovo Contatto / Aggiungi Contatto Manualmente"
- - invia qualsiasi emoji come reazione
- - mostrare le reazioni nei riepiloghi
- - blocca/archivia/ecc. le chat direttamente dai risultati di ricerca
- - Risolti bug e altro ancora
@@ -1,4 +0,0 @@
- aggiungi un'opzione per contrassegnare tutte le chat selezionate come "Lette" (tocca a lungo una chat per avviare la modalità di selezione)
- - i nuovi profili chatmail per dispositivo singolo hanno come impostazione predefinita "Elimina Messaggi Dopo il Download"
- - quando si utilizza un profilo chatmail su più dispositivi, la cancellazione viene modificata in "Automatica" (la strategia di cancellazione dipende quindi dal server)
- - Risolti bug e altro ancora
@@ -0,0 +1,12 @@
+Delta Chat é um aplicativo de mensagens que é completamente compatível com a infraestrutura de email já existente.
+Assim, com o Delta Chat você tem a facilidade de muitos aplicativos de mensagens com o alcance de email. Além disso, você é independente de outras companhias e sercviços -- já que suas informações e dados não estão relacionadas com o Delta Chat, você não vai nem adicionar novas permissões aqui.
+Resumo de alguns recursos:
+* Seguro com criptografia de ponta a ponta, com suporte ao novo padrão  <a href="https://autocrypt.org">Autocrypt</a> 
+* Rápido usando Push-IMAP
+* Maior base de usuários -- destinatários que não estiverem usando Delta Chat podem ser alcançados também
+* Compatívle -- não apenas consigo mesmo
+* Interface de usuário elegante e simples
+* Sistema distribuído
+* Sem spam -- apenas mensages de usuários conhecidos são mostradas por padrão
+* Confiável -- pode até ser usado para mensagens comerciais
+* Completamente OpenSource e baseado em padrões
@@ -126,7 +126,7 @@ if test -z $1 || test $1 = armeabi-v7a; then
    TARGET_CC="$TOOLCHAIN/bin/armv7a-linux-androideabi21-clang" \
    TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
    TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
-    cargo build $RELEASEFLAG --target armv7-linux-androideabi -p deltachat_ffi --features jsonrpc
+    cargo build $RELEASEFLAG --target armv7-linux-androideabi -p deltachat_ffi
    cp $CARGO_TARGET_DIR/armv7-linux-androideabi/$RELEASE/libdeltachat.a $jnidir/armeabi-v7a
 fi

@@ -135,7 +135,7 @@ if test -z $1 || test $1 = arm64-v8a; then
    TARGET_CC="$TOOLCHAIN/bin/aarch64-linux-android21-clang" \
    TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
    TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
-    cargo build $RELEASEFLAG --target aarch64-linux-android -p deltachat_ffi --features jsonrpc
+    cargo build $RELEASEFLAG --target aarch64-linux-android -p deltachat_ffi
    cp $CARGO_TARGET_DIR/aarch64-linux-android/$RELEASE/libdeltachat.a $jnidir/arm64-v8a
 fi

@@ -144,7 +144,7 @@ if test -z $1 || test $1 = x86; then
    TARGET_CC="$TOOLCHAIN/bin/i686-linux-android21-clang" \
    TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
    TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
-    cargo build $RELEASEFLAG --target i686-linux-android -p deltachat_ffi --features jsonrpc
+    cargo build $RELEASEFLAG --target i686-linux-android -p deltachat_ffi
    cp $CARGO_TARGET_DIR/i686-linux-android/$RELEASE/libdeltachat.a $jnidir/x86
 fi

@@ -153,7 +153,7 @@ fi
     TARGET_CC="$TOOLCHAIN/bin/x86_64-linux-android21-clang" \
     TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
     TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
-     cargo build $RELEASEFLAG --target x86_64-linux-android -p deltachat_ffi --features jsonrpc
+     cargo build $RELEASEFLAG --target x86_64-linux-android -p deltachat_ffi
     cp $CARGO_TARGET_DIR/x86_64-linux-android/$RELEASE/libdeltachat.a $jnidir/x86_64
 fi

@@ -1 +1 @@
-1.77.0
+1.83.0
@@ -4,3 +4,4 @@ find ./src/main/assets/help/ -type f -name '*.html' | xargs sed -i 's/github.com
 find ./src/main/assets/help/ -type f -name '*.html' | xargs sed -i 's/ArcaneChat/Delta Chat/g'
 find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/github.com\/ArcaneChat/get.delta.chat/g'
 find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/ArcaneChat/Delta Chat/g'
+sed -i 's/>Delta Chat</>ArcaneChat</g' ./src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 set -e # stop on all errors

 git submodule update --init --recursive
@@ -30,7 +30,6 @@ echo ""
 echo "and now: here is Delta Chat $VERSION - choose your flavour and mind your backups:"
 echo "- 🍋 https://download.delta.chat/android/beta/deltachat-gplay-release-$VERSION.apk (google play candidate, overwrites existing installs, should keep data)"
 echo "- 🍉 https://download.delta.chat/android/beta/deltachat-foss-debug-$VERSION.apk (f-droid candidate, can be installed beside google play)"
-echo "- 🍏 https://testflight.apple.com/join/uEMc1NxS (ios, update to $VERSION may take a day or so)"
 echo ""
 echo "what to test: PLEASE_FILL_OUT"

@@ -1,5 +1,11 @@
 package com.b44t.messenger;

+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.typeText;
+import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
+import static androidx.test.espresso.matcher.ViewMatchers.withHint;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
@@ -23,12 +29,6 @@ import org.thoughtcrime.securesms.util.AccessibilityUtil;
 import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.Util;

-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.typeText;
-import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
-import static androidx.test.espresso.matcher.ViewMatchers.withHint;
-import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
-
 public class TestUtils {
  private static int createdAccountId = 0;
  private static boolean resetEnterSends = false;
@@ -1,5 +1,14 @@
 package com.b44t.messenger.uibenchmarks;

+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.Espresso.pressBack;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.replaceText;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
+import static androidx.test.espresso.matcher.ViewMatchers.withHint;
+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;
@@ -17,15 +26,6 @@ import org.junit.runner.RunWith;
 import org.thoughtcrime.securesms.ConversationListActivity;
 import org.thoughtcrime.securesms.R;

-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.Espresso.pressBack;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.action.ViewActions.replaceText;
-import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
-import static androidx.test.espresso.matcher.ViewMatchers.withHint;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
@Ignore("This is not a test, but a benchmark. Remove the @Ignore to run it.")
@RunWith(AndroidJUnit4.class)
@LargeTest
@@ -1,5 +1,16 @@
 package com.b44t.messenger.uitests.offline;

+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.Espresso.pressBack;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
+import static androidx.test.espresso.matcher.ViewMatchers.isClickable;
+import static androidx.test.espresso.matcher.ViewMatchers.withHint;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
 import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
@@ -25,17 +36,6 @@ import org.thoughtcrime.securesms.connect.DcHelper;

 import java.io.File;

-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.Espresso.pressBack;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
-import static androidx.test.espresso.matcher.ViewMatchers.isClickable;
-import static androidx.test.espresso.matcher.ViewMatchers.withHint;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
-

@RunWith(AndroidJUnit4.class)
@LargeTest
@@ -93,7 +93,7 @@ public class SharingTest {
      }
    }
    Uri uri = Uri.parse("content://" + BuildConfig.APPLICATION_ID + ".attachments/" + Uri.encode(pngImage));
-    DcHelper.sharedFiles.put("/" + pngImage, 1);
+    DcHelper.sharedFiles.put(pngImage, "image/png");

    Intent i = new Intent(Intent.ACTION_SEND);
    i.setType("image/png");
@@ -1,6 +1,15 @@
 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;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isClickable;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
+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;
@@ -17,15 +26,6 @@ import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.WelcomeActivity;

-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.action.ViewActions.replaceText;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isClickable;
-import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
-import static androidx.test.espresso.matcher.ViewMatchers.withHint;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
@RunWith(AndroidJUnit4.class)
@LargeTest
 public class OnboardingTest {
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.notifications;

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

 /*
@@ -20,7 +20,6 @@
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
    <uses-permission android:name="android.permission.RECORD_AUDIO" />
@@ -329,8 +328,6 @@
              android:theme="@style/TextSecure.ScribbleTheme"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

-    <activity android:name="com.soundcloud.android.crop.CropImageActivity" />
-
    <activity android:name=".InstantOnboardingActivity"
              android:theme="@style/TextSecure.LightTheme"
              android:windowSoftInputMode="stateHidden|adjustResize"
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html><head><meta charset="UTF-8" /><meta name="viewport" content="initial-scale=1.0" /><link rel="stylesheet" href="../help.css" /></head><body><ul id="top">
+<html lang="cs"><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="#co-je-delta-chat">Co je Delta Chat?</a>
    <ul>
      <li><a href="#jak-najít-lidi-k-hovoru">Jak najít lidi k hovoru?</a></li>
@@ -599,16 +599,16 @@ to any system involved in the delivery of Push Notifications.</p>

 <ul>
  <li>
-    <p>A Delta Chat app obtains a “device token” locally and stores it
+    <p>A Delta Chat app obtains a “device token” locally, encrypts it and stores it
 on the <a href="https://delta.chat/chatmail">chatmail</a> server.</p>
  </li>
  <li>
    <p>When a <a href="https://delta.chat/chatmail">chatmail</a> server receives an e-mail for a Delta Chat user
-it forwards the “device token” to the central Delta Chat notification proxy.</p>
+it forwards the encrypted device token to the central Delta Chat notification proxy.</p>
  </li>
  <li>
-    <p>The central Delta Chat notification proxy forwards
-the “device token” to the respective Push service (Apple, Google, etc.),
+    <p>The central Delta Chat notification proxy decrypts the device token
+and forwards it to the respective Push service (Apple, Google, etc.),
 without ever knowing the IP or e-mail address of Delta Chat users.</p>
  </li>
  <li>
@@ -621,14 +621,15 @@ and also never see any message content (also not in encrypted forms).</p>
  </li>
 </ul>

-<p>As of May 2024, chatmail servers know about “device tokens”
-but we plan to encrypt this information to the notification proxy
-such that the chatmail server never learns the device token.</p>
-
 <p>The central Delta Chat notification proxy <a href="https://github.com/deltachat/notifiers">is small and fully implemented in Rust</a>
 and forgets about device-tokens as soon as Apple/Google/etc processed them,
 usually in a matter of milliseconds.</p>

+<p>Note that the device token is encrypted between apps and notification proxy
+but it is not signed. 
+The notification proxy thus never sees e-mail addresses, IP-addresses or
+any cryptographic identity information associated with a user’s device (token).</p>
+
 <p>Resulting from this overall privacy design, even the seizure of a chatmail server,
 or the full seizure of the central Delta Chat notification proxy
 would not reveal private information that Push services do not already have.</p>
@@ -889,7 +890,7 @@ and GnuPG (GPG), a command line tool implementing OpenPGP.
 Many public critiques of OpenPGP actually discuss GnuPG which Delta Chat has never used. 
 Delta Chat rather uses the OpenPGP Rust implementation <a href="https://github.com/rpgp/rpgp">rPGP</a>,
 available as <a href="https://crates.io/crates/pgp">an independent “pgp” package</a>,
-and <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">security-audited in 2019</a>.</p>
+and <a href="#security-audits">security-audited in 2019 and 2024</a>.</p>

 <p>We aim, along with other OpenPGP implementors, 
 to further improve security characteristics by implementing the
@@ -1197,10 +1198,25 @@ Pro ostatní programy by mělo jít nalézt řešení na Interentu.</p>
        
      </h3>

-<p>The Delta Chat project underwent four independent security audits and one
-independent security analysis, from most recent to older:</p>
+<p>Yes, multiple times. 
+The Delta Chat project continuously undergoes independent security audits and analysis,
+from most recent to older:</p>

 <ul>
+  <li>
+    <p>2024 December, an <a href="https://github.com/rpgp/docs/blob/main/audits/NGI%20Core%20rPGP%20penetration%20test%20report%202024%201.0.pdf">NLNET-commissioned Evaluation of
+rPGP</a> by <a href="https://www.radicallyopensecurity.com/">Radically Open Security</a> took place.
+rPGP serves as the end-to-end encyption <a href="https://openpgp.org">OpenPGP</a> engine of Delta Chat. 
+Two advisories were released related to the findings of this audit:</p>
+
+    <ul>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-9rmp-2568-59rv">“Panics on Malformed Untrusted Input”</a> CVE-2024-53856</li>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-4grw-m28r-q285">“Potential Resource Exhaustion when handling Untrusted Messages”</a> CVE-2024-53857</li>
+    </ul>
+
+    <p>The issues outlined in these advisories have been fixed and are part of Delta Chat 
+releases on all appstores since December 2024.</p>
+  </li>
  <li>
    <p>2024 March, we received a deep security analysis from the Applied Cryptography
 research group at ETH Zuerich and addressed all raised issues. 
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html><head><meta charset="UTF-8" /><meta name="viewport" content="initial-scale=1.0" /><link rel="stylesheet" href="../help.css" /></head><body><ul id="top">
+<html lang="de"><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="#was-ist-delta-chat">Was ist Delta Chat?</a>
    <ul>
      <li><a href="#wie-finde-ich-leute-mit-denen-ich-chatten-kann">Wie finde ich Leute, mit denen ich chatten kann?</a></li>
@@ -30,14 +30,14 @@
      <li><a href="#was-sind-push-benachrichtigungen-wie-kann-ich-nachrichten-sofort-erhalten">Was sind Push-Benachrichtigungen? Wie kann ich Nachrichten sofort erhalten?</a></li>
      <li><a href="#sind-push-benachrichtigungen-auf-ios-geräten-aktiviert-gibt-es-alternativen">Sind Push-Benachrichtigungen auf iOS-Geräten aktiviert? Gibt es Alternativen?</a></li>
      <li><a href="#android-push">Sind Push-Benachrichtigungen auf Android-Geräten aktiviert/erforderlich?</a></li>
-      <li><a href="#privacy-notifications">Wie privat sind Delta Chat Push-Benachrichtigungen?</a></li>
+      <li><a href="#privacy-notifications">Wie privat sind Delta-Chat-Push-Benachrichtigungen?</a></li>
      <li><a href="#warum-integriert-sich-delta-chat-in-zentralisierte-proprietäre-applegoogle-push-dienste">Warum integriert sich Delta Chat in zentralisierte, proprietäre Apple/Google-Push-Dienste?</a></li>
    </ul>
  </li>
  <li><a href="#verschlüsselung-und-sicherheit">Verschlüsselung und Sicherheit</a>
    <ul>
      <li><a href="#welche-standards-werden-für-die-ende-zu-ende-verschlüsselung-verwendet">Welche Standards werden für die Ende-zu-Ende-Verschlüsselung verwendet?</a></li>
-      <li><a href="#whene2e">Wie kann ich wissen, ob Nachrichten Ende-zu-Ende verschlüsselt sind?</a></li>
+      <li><a href="#whene2e">Wie kann ich wissen, ob Nachrichten Ende-zu-Ende-verschlüsselt sind?</a></li>
      <li><a href="#howtoe2ee">Wie kann ich garantierte Ende-zu-Ende-Verschlüsselung und grüne Häkchen erhalten?</a></li>
      <li><a href="#e2eeguarantee">Was bedeuten das “Grüne Häkchen” und die “garantierte Ende-zu-Ende-Verschlüsselung”?</a></li>
      <li><a href="#nocryptanymore">Ein Kontakt hat eine Nachricht von einem anderen Gerät gesendet”, was kann ich tun?</a></li>
@@ -65,10 +65,10 @@
      <li><a href="#kann-ich-delta-chat-auf-mehreren-geräten-zur-selben-zeit-verwenden">Kann ich Delta Chat auf mehreren Geräten zur selben Zeit verwenden?</a></li>
      <li><a href="#fehlersuche">Fehlersuche</a></li>
      <li><a href="#backup">Manueller Transfer</a></li>
-      <li><a href="#gibt-es-pläne-für-eine-delta-chat-web-anwendung">Gibt es Pläne für eine Delta Chat Web-Anwendung?</a></li>
+      <li><a href="#gibt-es-pläne-für-eine-delta-chat-web-anwendung">Gibt es Pläne für eine Delta-Chat-Web-Anwendung?</a></li>
    </ul>
  </li>
-  <li><a href="#webxdc">Webxdc Apps</a>
+  <li><a href="#webxdc">Webxdc-Apps</a>
    <ul>
      <li><a href="#wie-privat-sind-webxdc-apps">Wie privat sind Webxdc Apps?</a></li>
      <li><a href="#wo-bekomme-ich-webxdc-apps">Wo bekomme ich Webxdc Apps?</a></li>
@@ -153,7 +153,7 @@ auch wenn der Empfänger Delta Chat nicht benutzt.</p>
 die sofortige Push-Benachrichtigungen für iOS- und Android-Geräte bieten.</p>
  </li>
  <li>
-    <p>Durchgängige <a href="#multiple-accounts">Multi-Profil</a> und Multi-Geräte-Unterstützung auf allen Plattformen.</p>
+    <p>Durchgängige <a href="#multiple-accounts">Multi-Profil-</a> und Multi-Geräte-Unterstützung auf allen Plattformen.</p>
  </li>
  <li>
    <p>Interaktive <a href="https://webxdc.org/apps">Webanwendungen in Chats</a> für Spiele und für die Zusammenarbeit</p>
@@ -304,7 +304,7 @@ unter dem Text Ihrer Nachrichten.</p>
      <li>entweder weil der Kontakt Ihnen direkt eine Nachricht gesendet hat,</li>
      <li>weil der Kontakt etwas an eine Gruppe geschrieben hat, in der sie beide Mitglied sind,</li>
      <li>weil der Kontakt Ihnen eine Lesebestätigung für eine von Ihnen geschriebene Nachricht gesendet hat</li>
-      <li>oder weil der Kontakt Daten mithilfe einer <a href="#webxdc">Webxdc App</a> an Ihre Delta Chat-App gesendet hat.</li>
+      <li>oder weil der Kontakt Daten mithilfe einer <a href="#webxdc">Webxdc-App</a> an Ihre Delta-Chat-App gesendet hat.</li>
    </ul>
  </li>
  <li>Dies ist also kein Echtzeit-Online-Status - und wenn jemand nicht sofort antwortet, obwohl er online zu sein scheint, machen Sie sich keine Sorgen und geben Sie ihm etwas Raum. ;-)</li>
@@ -487,7 +487,7 @@ und Benachrichtigungen auf dem Telefon des Nutzers anzeigen kann.</p>
    <p>iOS-Geräten, durch die Integration mit den Apple-Push-Diensten.</p>
  </li>
  <li>
-    <p>Android-Geräten, durch die Integration des Google FCM Push-Dienste,
+    <p>Android-Geräten, durch die Integration des Google-FCM-Push-Dienstes,
 auch auf Geräten, die <a href="https://microg.org">microG</a>
 anstelle von proprietärem Google-Code auf dem Telefon.</p>
  </li>
@@ -518,7 +518,7 @@ keine Daten an Apple weitergibt, die Apple nicht bereits hat.</p>
        
      </h3>

-<p>Wenn ein „Push-Service“ verfügbar ist, aktiviert Delta Chat Push-Benachrichtigungen
+<p>Wenn ein „Push-Service“ verfügbar ist, aktiviert Delta Chat Push-Benachrichtigungen,
 um eine sofortige Nachrichtenzustellung für alle Chatmail-Benutzer zu erreichen.
 Wenn Sie einen klassischen E-Mail-Anbieter anstelle von <a href="https://delta.chat/chatmail">chatmail</a> Servern verwenden,
 sind Push-Benachrichtigungen nicht verfügbar.</p>
@@ -544,7 +544,7 @@ können sicher ausprobiert werden, wenn Sie feststellen, dass Nachrichten nur mi
      <h3 id="privacy-notifications">
        
        
-          Wie privat sind Delta Chat Push-Benachrichtigungen? <a href="#privacy-notifications" class="anchor"></a>
+          Wie privat sind Delta-Chat-Push-Benachrichtigungen? <a href="#privacy-notifications" class="anchor"></a>
        
        
      </h3>
@@ -557,16 +557,15 @@ an irgendein System, das an der Zustellung von Push-Benachrichtigungen beteiligt

 <ul>
  <li>
-    <p>Eine Delta-Chat-Anwendung erhält lokal ein „Geräte-Token“ (eine zufällige Zahl) und speichert es
+    <p>Eine Delta-Chat-Anwendung erhält lokal ein „Geräte-Token“, verschlüsselt und speichert es
 auf dem <a href="https://delta.chat/chatmail">Chatmail</a>-Server.</p>
  </li>
  <li>
-    <p>Wenn ein <a href="https://delta.chat/chatmail">Chatmail</a>-Server eine E-Mail für einen Delta Chat-Benutzer erhält
-erhält, leitet er den „Geräte-Token“ an den zentralen Delta-Chat-Benachrichtigungs-Proxy weiter.</p>
+    <p>Wenn ein <a href="https://delta.chat/chatmail">Chatmail</a>-Server eine E-Mail für einen Delta-Chat-Benutzer erhält
+erhält, leitet er das verschlüsselte Geräte-Token an den zentralen Delta-Chat-Benachrichtigungs-Proxy weiter.</p>
  </li>
  <li>
-    <p>Der zentrale Delta-Chat-Benachrichtigungs-Proxy leitet
-das „Geräte-Token“ an den jeweiligen Push-Dienst (Apple, Google, etc.) weiter,
+    <p>Der zentrale Delta-Chat-Benachrichtigungs-Proxy entschlüsselt das Geräte-Token und leitet es an den jeweiligen Push-Dienst (Apple, Google, etc.) weiter,
 ohne jemals die IP- oder E-Mail-Adresse des Delta-Chat-Benutzers zu kennen.</p>
  </li>
  <li>
@@ -578,14 +577,15 @@ und auch nie den Inhalt einer Nachricht (auch nicht in verschlüsselter Form).</
  </li>
 </ul>

-<p>Stand Mai 2024 kennen die Chatmail-Server die Geräte-Token,
-aber wir planen, diese Informationen an den Benachrichtigungs-Proxy zu verschlüsseln
-zu verschlüsseln, so dass der Chatmail-Server niemals das „Geräte-Token“ erfährt.</p>
-
 <p>Der zentrale Delta-Chat-Benachrichtigungs-Proxy <a href="https://github.com/deltachat/notifiers">ist klein und vollständig in Rust implementiert</a>
 und vergisst die Geräte-Token, sobald Apple/Google/etc. sie verarbeitet hat,
 normalerweise innerhalb weniger Millisekunden.</p>

+<p>Beachten Sie, dass das Geräte-Token zwischen Anwendungen und dem Benachrichtigungs-Proxy verschlüsselt,
+aber nicht signiert ist. 
+Der Benachrichtigungs-Proxy sieht also niemals E-Mail-Adressen, IP-Adressen oder
+irgendwelche kryptografischen Identitätsinformationen, die mit dem Gerät oder dem Geräte-Token eines Nutzers verbunden sind.</p>
+
 <p>Aufgrund dieses umfassenden Datenschutzkonzepts würde sogar die Beschlagnahmung eines Chatmail-Servers,
 oder die vollständige Beschlagnahmung des zentralen Delta-Chat-Benachrichtigungsproxys
 keine privaten Informationen preisgeben, die den zentralen Push-Diensten nicht bereits vorliegen.</p>
@@ -627,7 +627,7 @@ Willkommen bei der Macht des interoperablen und massiven Chatmail- und E-Mail-Sy
 <p><a href="https://autocrypt.org">Autocrypt</a> wird verwendet, um automatisch
 eine Ende-zu-Ende-Verschlüsselung mit Kontakten und Gruppenchats herzustellen.
 Autocrypt verwendet eine begrenzte und <a href="#openpgp-secure">sichere Untermenge des OpenPGP-Standards</a>.
-Ende-zu-Ende verschlüsselte Nachrichten sind mit einem Vorhängeschloss gekennzeichnet <img style="vertical-align:middle; width:1.2em; margin:1px" src="../lock-icon.png" alt="padlock" /></p>
+Ende-zu-Ende-verschlüsselte Nachrichten sind mit einem Vorhängeschloss gekennzeichnet <img style="vertical-align:middle; width:1.2em; margin:1px" src="../lock-icon.png" alt="padlock" /></p>

 <p><a href="https://securejoin.delta.chat/en/latest/new.html">Secure-Join-Protokolle</a>
 werden für Chats mit garantierter Ende-zu-Ende-Verschlüsselung verwendet, 
@@ -639,7 +639,7 @@ garantieren Ende-zu-Ende-verschlüsselte Nachrichten.</p>
      <h3 id="whene2e">
        
        
-          Wie kann ich wissen, ob Nachrichten Ende-zu-Ende verschlüsselt sind? <a href="#whene2e" class="anchor"></a>
+          Wie kann ich wissen, ob Nachrichten Ende-zu-Ende-verschlüsselt sind? <a href="#whene2e" class="anchor"></a>
        
        
      </h3>
@@ -761,7 +761,7 @@ auch wenn der Kontakt dort Mitglied ist.</p>
 <p><strong>Ihr Kontakt verwendet Delta Chat auf einem zweiten Gerät (Smartphone oder Laptop)</strong></p>

 <p>Wenn Ihr Kontakt ein weiteres Gerät mit Delta Chat eingerichtet hat,
-sollte das Konto von dem neuen Gerät entfernen werden und <a href="#multiclient">als zweites Gerät, wie hier beschrieben</a> erneut hinzugefügt werden.
+sollte das Konto von dem neuen Gerät entfernen werden und <a href="#multiclient">als zweites Gerät, wie hier beschrieben</a>, erneut hinzugefügt werden.
 Sobald sie sich danach schreiben, wird die Warnung verschwinden
 und die Verschlüsselung ist mit beiden Geräten Ihres Kontakts garantiert.</p>

@@ -836,7 +836,7 @@ und <em>GnuPG (GPG)</em>, einem Kommandozeilenprogramm, das OpenPGP implementier
 In vielen öffentlichen Kritiken zu OpenPGP wird GnuPG diskutiert, das Delta Chat nie verwendet hat. 
 Delta Chat verwendet stattdessen die OpenPGP-Rust-Implementierung <a href="https://github.com/rpgp/rpgp">rPGP</a>,
 die als <a href="https://crates.io/crates/pgp">ein unabhängiges “pgp”-Paket</a>,
-verfügbar und <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">2019 sicherheitsgeprüft</a> wurde.</p>
+verfügbar ist und <a href="#security-audits">2019 und 2024 sicherheitsgeprüft</a> wurde.</p>

 <p>Unser Ziel ist, zusammen mit anderen OpenPGP-Implementierungen, 
 die Sicherheitseigenschaften durch das im Sommer 2023 angenommene
@@ -883,7 +883,7 @@ wenn dieser falsch ist.</p>
 <p>Delta Chat war auch nie anfällig für den EFAIL-Angriff “Direct Exfiltration”,
 da nur <code class="language-plaintext highlighter-rouge">multipart/encrypted</code> Nachrichten entschlüsselt werden,
 die genau einen verschlüsselten und signierten Teil enthalten;
-so wie in der Autocrypt Level 1 Spezifikation definiert.</p>
+so wie in der Autocrypt-Level-1-Spezifikation definiert.</p>
    
      <h3 id="tls">
        
@@ -949,7 +949,7 @@ Nachrichten an die Geräte der Empfänger weiterzuleiten und zuzustellen.</p>
        
      </h3>

-<p>Sowohl zum Schutz vor E-Mail-Servern, die Metadaten sammeln 
+<p>Sowohl zum Schutz vor E-Mail-Servern, die Metadaten sammeln, 
 als auch gegen die Gefahr der Beschlagnahmung von Geräten
 empfehlen wir die Verwendung einer für Delta Chat optimierten <a href="https://delta.chat/serverguide">E-Mail-Server-Instanz</a>, um pseudonym-temporäre Konten durch Scannen von QR-Codes zu erstellen.
 Beachten Sie, dass Delta-Chat-Apps auf allen Plattformen mehrere Konten unterstützen. 
@@ -996,7 +996,7 @@ ohne Ende-zu-Ende-Unterstützung verwendet.</p>
      </h3>

 <p>Wenn ein Kontakt keine Autocrypt-fähige App verwendet,
-werden alle Nachrichten, die diesen Kontakt betreffen (in Gruppen- oder Direkt-Chats)
+werden alle Nachrichten, die diesen Kontakt betreffen (in Gruppen- oder Direkt-Chats),
 nicht Ende-zu-Ende-verschlüsselt und zeigen daher kein “Vorhängeschloss”.
 Beachten Sie, auch Kontakte, die primär Delta Chat verwenden,
 können gleichzeitig auch nicht-Autocrypt-fähige Apps verwenden.
@@ -1012,7 +1012,7 @@ um zu verhindern, dass unlesbare Nachrichten auf der Seite Ihrer Kontakte ankomm
      </h3>

 <p>Wenn Sie einen sicheren Ende-zu-Ende-verschlüsselten Chat mit einem Kontakt benötigen, 
-der sowohl Delta Chat als auch nicht-Autocrypt-Anwendungen nutzt,
+der sowohl Delta Chat als auch Nicht-Autocrypt-Anwendungen nutzt,
 können Sie eine <a href="#howtoe2ee">garantierte Ende-zu-Ende-Verschlüsselung</a> einrichten, mit einer Gruppe mit Ihnen beiden als Mitgliedern. 
 In diesem Gruppenchat werden alle Nachrichten Ende-zu-Ende verschlüsselt werdejn,
 auch wenn im Direkt-Chat eine
@@ -1026,10 +1026,10 @@ auch wenn im Direkt-Chat eine
        
      </h3>

-<p>Der beste Weg, um sicherzustellen, dass alle Nachrichten Ende-zu-Ende verschlüsselt sind
+<p>Der beste Weg, um sicherzustellen, dass alle Nachrichten Ende-zu-Ende-verschlüsselt sind
 und Metadaten so schnell wie möglich gelöscht werden,
 ist <a href="#howtoe2ee">die Verwendung von Chats mit garantierter Ende-zu-Ende-Verschlüsselung</a>
-und die Aktivierung von <a href="#ephemeralmsgs">Verschwindende Nachrichten</a>.</p>
+und die Aktivierung von <a href="#ephemeralmsgs">verschwindenden Nachrichten</a>.</p>

 <p>Garantierte Ende-zu-Ende-Verschlüsselung schützt vor <a href="https://en.wikipedia.org/wiki/Man-in-the-middle_attack">MITM-Angriffen</a>
 und das Aktivieren von “Verschwindende Nachrichten” löscht die Nachrichten
@@ -1046,7 +1046,7 @@ auf dem Server und Lokal nach einer vom Benutzer eingestellten Zeit.</p>
      </h3>

 <p>Nein, Delta Chat unterstützt kein “Perfect Forward Secrecy” (PFS).
-Das bedeutet, dass wenn Ihr privater Delta-Chat-Schlüssel durchgesickert ist,
+Das bedeutet, wenn Ihr privater Delta-Chat-Schlüssel durchgesickert ist
 und jemand Ihre vorherigen In-Transit-Nachrichten gesammelt hat,
 können diese mit dem veröffentlichtem Schlüssel entschlüsselt werden.</p>

@@ -1057,7 +1057,7 @@ Die typische, reale Situation für durchgesickerte private Schlüssel, ist die <
 OpenPGP ist nur ein Container für verschlüsselte Nachrichten mit dem
 die Verwaltung der Schlüssel (und damit die Schlüsselrotation oder das Schlüssel-“Ratcheting”) 
 auf flexible Weise organisiert werden kann. 
-Siehe <a href="https://gitlab.com/sequoia-pgp/openpgp-dr">Seqouia’s PFS-Prototyp</a>
+Siehe <a href="https://gitlab.com/sequoia-pgp/openpgp-dr">Seqouias PFS-Prototyp</a>
 für bestehende Experimente in der OpenPGP-Community.</p>
    
      <h3 id="ist-die-ende-zu-ende-verschlüsselung-von-delta-chat-genauso-sicher-wie-die-von-signal">
@@ -1080,7 +1080,7 @@ aber irgendwie nicht Ihre Nachrichten - gleichzeitig aber eine vollständige Auf
 vergangenen verschlüsselten Nachrichten hat.</p>

 <p>In jedem Fall verwendet die Ende-zu-Ende-Verschlüsselung von Delta Chat eine <a href="#openpgp-secure">sichere Untermenge von OpenPGP</a>
-das [unabhängig sicherheitsgeprüft] wurde (../assets/blog/2019-first-security-review.pdf).</p>
+das <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">unabhängig sicherheitsgeprüft</a> wurde.</p>
    
      <h3 id="importkey">
        
@@ -1138,15 +1138,28 @@ Für andere Programme können Sie online eine Lösung finden.</p>
        
      </h3>

-<p>Das Delta-Chat-Projekt wurde in den letzten Jahren fünf unabhängigen Sicherheitsprüfungen und -analysen unterzogen:</p>
+<p>Ja, mehrfach.
+Das Delta-Chat-Projekt wird kontinuierlich unabhängigen Sicherheitsaudits und -analysen unterzogen:</p>

 <ul>
+  <li>
+    <p>Im Dezember 2024 fand eine <a href="https://github.com/rpgp/docs/blob/main/audits/NGI%20Core%20rPGP%20penetration%20test%20report%202024%201.0.pdf">von NLNET in Auftrag gegebene Bewertung von rPGP</a> durch <a href="https://www.radicallyopensecurity.com/">Radically Open Security</a> statt.
+rPGP wird für die <a href="https://openpgp.org">OpenPGP</a>-Ende-zu-Ende-Verschlüsselung verwendet. 
+Im Zusammenhang mit den Ergebnissen dieser Prüfung wurden zwei Hinweise veröffentlicht:</p>
+
+    <ul>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-9rmp-2568-59rv">“Panics on Malformed Untrusted Input”</a> CVE-2024-53856</li>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-4grw-m28r-q285">“Potential Resource Exhaustion when handling Untrusted Messages”</a> CVE-2024-53857</li>
+    </ul>
+
+    <p>Die in diesen Hinweisen beschriebenen Probleme wurden behoben und sind Bestandteil der Delta Chat Veröffentlichungen in allen Appstores seit Dezember 2024.</p>
+  </li>
  <li>
    <p>Im März 2024 erhielten wir von der Forschungsgruppe “Applied Cryptography” der ETH Zürich eine umfassende Sicherheitsanalyse und haben alle aufgeworfenen Fragen adressiert. 
 Weitere Informationen finden Sie in unserem Blogbeitrag über <a href="https://delta.chat/en/2024-03-25-crypto-analysis-securejoin">Hardening Guaranteed End-to-End encryption</a> und in der hinterher publizierten <a href="https://eprint.iacr.org/2024/918.pdf">Kryptografischen Analyse von Delta Chat</a></p>
  </li>
  <li>
-    <p>Im April 2023 haben wir Sicherheits- und Datenschutzprobleme mit den “In Chats geteilten Apps”-Feature behoben, die mit Fehlern beim Sandboxing, insbesondere mit Chromium zusammenhängen. Wir haben daraufhin eine unabhängige Sicherheitsprüfung von Cure53 durchführen lassen, und alle gefundenen Probleme wurden mit den im April 2023 veröffentlichten 1.36 Releases behoben. Siehe <a href="https://delta.chat/en/2023-05-22-webxdc-security">hier für die vollständige Hintergrundgeschichte</a>.</p>
+    <p>Im April 2023 haben wir Sicherheits- und Datenschutzprobleme mit dem “In Chats geteilten Apps”-Feature behoben, die mit Fehlern beim Sandboxing, insbesondere mit Chromium zusammenhängen. Wir haben daraufhin eine unabhängige Sicherheitsprüfung von Cure53 durchführen lassen, und alle gefundenen Probleme wurden mit den im April 2023 veröffentlichten 1.36 Releases behoben. Siehe <a href="https://delta.chat/en/2023-05-22-webxdc-security">hier für die vollständige Hintergrundgeschichte</a>.</p>
  </li>
  <li>
    <p>Im März 2023 analysierte <a href="https://cure53.de">Cure53</a> sowohl die Transportverschlüsselung von Delta Chats Netzwerkverbindungen als auch das reproduzierbare Mailserver-Setup wie <a href="https://delta.chat/de/serverguide">auf dieser Seite empfohlen</a>. Sie können mehr über das Audit <a href="https://delta.chat/en/2023-03-27-third-independent-security-audit">in unserem Blog</a> lesen oder Sie lesen den <a href="https://delta.chat/assets/blog/MER-01-report.pdf">vollständigen Bericht hier</a>.</p>
@@ -1156,8 +1169,8 @@ Weitere Informationen finden Sie in unserem Blogbeitrag über <a href="https://d
 Es wurden keine kritischen oder hochgradig gefährlichen Probleme gefunden. Der Bericht wies auf einige Schwachstellen mittlerer Schwere hin - sie stellen für sich genommen keine Bedrohung für Delta-Chat-Benutzer dar, da sie von der Umgebung abhängen, in der Delta Chat verwendet wird. Aus Gründen der Benutzerfreundlichkeit und der Kompatibilität können wir nicht alle Schwachstellen beseitigen und haben beschlossen, Sicherheitsempfehlungen für bedrohte Benutzer zu geben. Sie können den <a href="https://delta.chat/assets/blog/2020-second-security-review.pdf">vollständigen Bericht hier</a> lesen.</p>
  </li>
  <li>
-    <p>Im Jahr 2019 analysierte <a href="https://includesecurity.com">Include Security</a> die von Delta Chat verwendeten <a href="https://github.com/rpgp/rpgp">PGP</a> und <a href="https://github.com/RustCrypto/RSA">RSA</a> Bibliotheken.
-Es wurden keine kritischen Probleme gefunden, aber zwei Probleme mit hohem Schweregrad, die wir anschließend behoben haben. Außerdem wurden ein mittelschweres und einige weniger schwerwiegende Probleme gefunden, aber es gab keine Möglichkeit, diese Schwachstellen in der Delta-Chat-Implementierung auszunutzen. Einige dieser Schwachstellen haben wir dennoch nach Abschluss des Audits behoben. Sie können den [vollständigen Bericht hier] lesen (../assets/blog/2019-first-security-review.pdf).</p>
+    <p>Im Jahr 2019 analysierte <a href="https://includesecurity.com">Include Security</a> die von Delta Chat verwendeten <a href="https://github.com/rpgp/rpgp">PGP-</a> und <a href="https://github.com/RustCrypto/RSA">RSA-</a> Bibliotheken.
+Es wurden keine kritischen Probleme gefunden, aber zwei Probleme mit hohem Schweregrad, die wir anschließend behoben haben. Außerdem wurden ein mittelschweres und einige weniger schwerwiegende Probleme gefunden, aber es gab keine Möglichkeit, diese Schwachstellen in der Delta-Chat-Implementierung auszunutzen. Einige dieser Schwachstellen haben wir dennoch nach Abschluss des Audits behoben. Sie können den <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">vollständigen Bericht hier</a> lesen.</p>
  </li>
 </ul>
    
@@ -1260,32 +1273,32 @@ Verwenden Sie nach Möglichkeit ein Nicht-Gast-Netzwerk. Wenn Sie Zugriff auf de
      <li><strong>Wenn Sie iOS verwenden</strong> und auf Schwierigkeiten stoßen, hilft Ihnen vielleicht <a href="https://support.delta.chat/t/import-backup-to-ios/1628">diese Anleitung</a>.</li>
    </ul>
  </li>
-  <li>Sie sind nun synchronisiert und können beide Geräte zum Senden und Empfangen von Ende-zu-Ende verschlüsselten Nachrichten mit Ihren Kommunikationspartnern verwenden.</li>
+  <li>Sie sind nun synchronisiert und können beide Geräte zum Senden und Empfangen von Ende-zu-Ende-verschlüsselten-Nachrichten mit Ihren Kommunikationspartnern verwenden.</li>
 </ul>
    
      <h3 id="gibt-es-pläne-für-eine-delta-chat-web-anwendung">
        
        
-          Gibt es Pläne für eine Delta Chat Web-Anwendung? <a href="#gibt-es-pläne-für-eine-delta-chat-web-anwendung" class="anchor"></a>
+          Gibt es Pläne für eine Delta-Chat-Web-Anwendung? <a href="#gibt-es-pläne-für-eine-delta-chat-web-anwendung" class="anchor"></a>
        
        
      </h3>

 <ul>
  <li>Es gibt keine direkten Pläne, aber einige vorläufige Gedanken.</li>
-  <li>Es gibt 2-3 Möglichkeiten, einen Delta Chat Web-Client einzuführen, aber sie bedeuten alle immense Arbeit. Im Moment fokussieren wir uns darauf, stabile native Apps in den Appstores (Google Play/iOS/Windows/macOS/Linux repositories) anzubieten.</li>
-  <li>Sollten Sie einen Web-Client benötigen, weil Sie auf Ihrem Arbeitsrechner keine Software installieren dürfen, können Sie den Windows Desktop-Client bzw. Applmage für Linux nutzen. Sie finden diese unter <a href="https://get.delta.chat">get.delta.chat</a>.</li>
+  <li>Es gibt 2-3 Möglichkeiten, einen Delta-Chat-Web-Client einzuführen, aber sie bedeuten alle immense Arbeit. Im Moment fokussieren wir uns darauf, stabile native Apps in den Appstores (Google Play/iOS/Windows/macOS/Linux repositories) anzubieten.</li>
+  <li>Sollten Sie einen Web-Client benötigen, weil Sie auf Ihrem Arbeitsrechner keine Software installieren dürfen, können Sie den Windows-Desktop-Client bzw. Applmage für Linux nutzen. Sie finden diese unter <a href="https://get.delta.chat">get.delta.chat</a>.</li>
 </ul>
    
      <h2 id="webxdc">
        
        
-          Webxdc Apps <a href="#webxdc" class="anchor"></a>
+          Webxdc-Apps <a href="#webxdc" class="anchor"></a>
        
        
      </h2>

-<p>In Delta Chat können Sie <a href="https://webxdc.org">Webxdc Apps</a>, Anhänge mit der Dateierweiterung “.xdc” teilen. Sie können sehr unterschiedliche Dinge tun und machen Delta Chat zu einem wirklich erweiterbaren Messenger.</p>
+<p>In Delta Chat können Sie <a href="https://webxdc.org">Webxdc-Apps</a>, Anhänge mit der Dateierweiterung “.xdc” teilen. Sie können sehr unterschiedliche Dinge tun und machen Delta Chat zu einem wirklich erweiterbaren Messenger.</p>
    
      <h3 id="wie-privat-sind-webxdc-apps">
        
@@ -1311,7 +1324,7 @@ Verwenden Sie nach Möglichkeit ein Nicht-Gast-Netzwerk. Wenn Sie Zugriff auf de
      </h3>

 <ul>
-  <li>Grundsätzlich kann jeder Webxdc Apps mit anderen ohne Einschränkungen teilen.</li>
+  <li>Grundsätzlich kann jeder Webxdc-Apps mit anderen ohne Einschränkungen teilen.</li>
  <li>Von <a href="https://webxdc.org/apps/">webxdc.org/apps</a>.</li>
  <li>Sie können <a href="https://delta.chat/en/2023-08-11-xstore">‘hallo’ an xstore@testrun.org senden</a>
 um einen experimentellen Webxdc Appstore zu sehen.
@@ -1330,7 +1343,7 @@ forum</a> veröffentlicht und diskutiert.</li>

 <ul>
  <li>Webxdc Apps sind nur ZIP-Dateien, die HTML-, CSS- und JavaScript-Code enthalten.</li>
-  <li>Sie können die <a href="https://github.com/webxdc/hello">Hello World-Beispiel-App</a> erweitern, um loszulegen.</li>
+  <li>Sie können die <a href="https://github.com/webxdc/hello">Hello-World-Beispiel-App</a> erweitern, um loszulegen.</li>
  <li>Alles andere, was Sie wissen müssen, steht in der <a href="https://docs.webxdc.org/">Dokumentation</a>.</li>
  <li>Wenn Sie Fragen haben, können Sie andere mit Erfahrung im <a href="https://support.delta.chat/c/webxdc/20">Delta-Chat-Forum</a> fragen.</li>
 </ul>
@@ -1643,7 +1656,7 @@ wenn Sie eine <a href="#signature">Signaturtext</a> einfügen.</p>
 <ul>
  <li>Ja und Nein.</li>
  <li>Nein, Sie können sich nicht mit Delta Chat in ein Protonmail-, Tutanota- oder Criptext-Konto einloggen, da diese keinen Standard-E-Mail-Empfang über IMAP anbieten.</li>
-  <li>Ja, Sie können Delta Chat verwenden, um Nachrichten an Personen zu senden, die Protonmail, Tutanota oder Criptext verwenden. Diese Nachrichten werden jedoch nicht ende-zu-ende-verschlüsselt, da diese Anbieter keine mit dem <a href="https://autocrypt.org/">Autocrypt</a>-Standard kompatible Verschlüsselung verwenden.</li>
+  <li>Ja, Sie können Delta Chat verwenden, um Nachrichten an Personen zu senden, die Protonmail, Tutanota oder Criptext verwenden. Diese Nachrichten werden jedoch nicht Ende-zu-Ende-verschlüsselt, da diese Anbieter keine mit dem <a href="https://autocrypt.org/">Autocrypt</a>-Standard kompatible Verschlüsselung verwenden.</li>
  <li>Delta Chat kann Ende-zu-Ende-Verschlüsselung über jeden E-Mail-Anbieter mit jeder
 <a href="https://autocrypt.org/dev-status.html">Autocrypt-fähige E-Mail-Anwendung</a> herstellen</li>
 </ul>
@@ -1712,7 +1725,7 @@ Andernfalls könnten Sie unverschlüsselte Nachrichten aus diesen Gruppenchats e
    <p>Im <strong>Paketmanager</strong> Ihrer Linux-Distribution nachschauen</p>
  </li>
  <li>
-    <p><strong>Android APKs</strong> sind auch auf <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a> verfügbar.</p>
+    <p><strong>Android-APKs</strong> sind auch auf <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a> verfügbar.</p>
  </li>
 </ul>
    
@@ -1741,10 +1754,10 @@ Die zweite Förderung 2019/2020 (~$300K) half uns bei der  Erstellung der iOS-Ve
    <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>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>
+    <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>Von Ende 2021 bis März 2023 erhielten wir eine <em>Internet Freedom</em> Finanzierung (500K USD) vom U.S. Bureau of Democracy, Human Rights and Labor (DRL). Diese Finanzierung unterstützte unsere langjährigen Ziele, Delta Chat benutzerfreundlicher und kompatibel mit einer breiten Palette von E-Mail-Servern weltweit zu machen, sowie widerstandsfähiger und sicherer an Orten, die häufig von Internetzensur und Abschaltungen betroffen sind.</p>
+    <p>Von Ende 2021 bis März 2023 erhielten wir eine <em>Internet-Freedom</em>-Finanzierung (500K USD) vom U.S. Bureau of Democracy, Human Rights and Labor (DRL). Diese Finanzierung unterstützte unsere langjährigen Ziele, Delta Chat benutzerfreundlicher und kompatibel mit einer breiten Palette von E-Mail-Servern weltweit zu machen, sowie widerstandsfähiger und sicherer an Orten, die häufig von Internetzensur und Abschaltungen betroffen sind.</p>
  </li>
  <li>
    <p>2023-2024 schlossen wir erfolgreich das vom OTF finanzierte 
@@ -1754,11 +1767,11 @@ das <a href="https://delta.chat/chatmail">Chatmail-Server-Netzwerk</a>
 und „Instant Onboarding“ allen ab April 2024 veröffentlichten Anwendungen hinzu.</p>
  </li>
  <li>
-    <p>2023 und 2024 wurden wir in das Next Generation Internet (NGI)
-Programm für unsere Arbeit an <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a> aufgenommen,
+    <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/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>
@@ -1776,7 +1789,7 @@ Der Erhalt von Spenden hilft uns auch, unabhängiger und langfristig lebensfähi

 <p>Die oben aufgeführte finanzielle Förderung wird hauptsächlich von der merlinux GmbH in Freiburg (Deutschland) organisiert und an mehr als ein Dutzend Mitwirkende weltweit verteilt.</p>

-<p>Möglichkeiten mitzuwirken finden Sie Auf der <a href="https://delta.chat/de/contribute">Delta Chat Seite “Mitwirken”</a>.</p>
+<p>Möglichkeiten mitzuwirken finden Sie Auf der <a href="https://delta.chat/de/contribute">Delta-Chat-Seite “Mitwirken”</a>.</p>



@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html><head><meta charset="UTF-8" /><meta name="viewport" content="initial-scale=1.0" /><link rel="stylesheet" href="../help.css" /></head><body><ul id="top">
+<html lang="en"><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="#what-is-delta-chat">What is Delta Chat?</a>
    <ul>
      <li><a href="#how-can-i-find-people-to-chat-with">How can I find people to chat with?</a></li>
@@ -603,16 +603,16 @@ to any system involved in the delivery of Push Notifications.</p>

 <ul>
  <li>
-    <p>A Delta Chat app obtains a “device token” locally and stores it
+    <p>A Delta Chat app obtains a “device token” locally, encrypts it and stores it
 on the <a href="https://delta.chat/chatmail">chatmail</a> server.</p>
  </li>
  <li>
    <p>When a <a href="https://delta.chat/chatmail">chatmail</a> server receives an e-mail for a Delta Chat user
-it forwards the “device token” to the central Delta Chat notification proxy.</p>
+it forwards the encrypted device token to the central Delta Chat notification proxy.</p>
  </li>
  <li>
-    <p>The central Delta Chat notification proxy forwards
-the “device token” to the respective Push service (Apple, Google, etc.),
+    <p>The central Delta Chat notification proxy decrypts the device token
+and forwards it to the respective Push service (Apple, Google, etc.),
 without ever knowing the IP or e-mail address of Delta Chat users.</p>
  </li>
  <li>
@@ -625,14 +625,15 @@ and also never see any message content (also not in encrypted forms).</p>
  </li>
 </ul>

-<p>As of May 2024, chatmail servers know about “device tokens”
-but we plan to encrypt this information to the notification proxy
-such that the chatmail server never learns the device token.</p>
-
 <p>The central Delta Chat notification proxy <a href="https://github.com/deltachat/notifiers">is small and fully implemented in Rust</a>
 and forgets about device-tokens as soon as Apple/Google/etc processed them,
 usually in a matter of milliseconds.</p>

+<p>Note that the device token is encrypted between apps and notification proxy
+but it is not signed. 
+The notification proxy thus never sees e-mail addresses, IP-addresses or
+any cryptographic identity information associated with a user’s device (token).</p>
+
 <p>Resulting from this overall privacy design, even the seizure of a chatmail server,
 or the full seizure of the central Delta Chat notification proxy
 would not reveal private information that Push services do not already have.</p>
@@ -893,7 +894,7 @@ and GnuPG (GPG), a command line tool implementing OpenPGP.
 Many public critiques of OpenPGP actually discuss GnuPG which Delta Chat has never used. 
 Delta Chat rather uses the OpenPGP Rust implementation <a href="https://github.com/rpgp/rpgp">rPGP</a>,
 available as <a href="https://crates.io/crates/pgp">an independent “pgp” package</a>,
-and <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">security-audited in 2019</a>.</p>
+and <a href="#security-audits">security-audited in 2019 and 2024</a>.</p>

 <p>We aim, along with other OpenPGP implementors, 
 to further improve security characteristics by implementing the
@@ -1203,10 +1204,25 @@ For other programs, you should be able to find a solution online.</p>
        
      </h3>

-<p>The Delta Chat project underwent four independent security audits and one
-independent security analysis, from most recent to older:</p>
+<p>Yes, multiple times. 
+The Delta Chat project continuously undergoes independent security audits and analysis,
+from most recent to older:</p>

 <ul>
+  <li>
+    <p>2024 December, an <a href="https://github.com/rpgp/docs/blob/main/audits/NGI%20Core%20rPGP%20penetration%20test%20report%202024%201.0.pdf">NLNET-commissioned Evaluation of
+rPGP</a> by <a href="https://www.radicallyopensecurity.com/">Radically Open Security</a> took place.
+rPGP serves as the end-to-end encyption <a href="https://openpgp.org">OpenPGP</a> engine of Delta Chat. 
+Two advisories were released related to the findings of this audit:</p>
+
+    <ul>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-9rmp-2568-59rv">“Panics on Malformed Untrusted Input”</a> CVE-2024-53856</li>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-4grw-m28r-q285">“Potential Resource Exhaustion when handling Untrusted Messages”</a> CVE-2024-53857</li>
+    </ul>
+
+    <p>The issues outlined in these advisories have been fixed and are part of Delta Chat 
+releases on all appstores since December 2024.</p>
+  </li>
  <li>
    <p>2024 March, we received a deep security analysis from the Applied Cryptography
 research group at ETH Zuerich and addressed all raised issues. 
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html><head><meta charset="UTF-8" /><meta name="viewport" content="initial-scale=1.0" /><link rel="stylesheet" href="../help.css" /></head><body><ul id="top">
+<html lang="es"><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="#qué-es-delta-chat">¿Qué es Delta Chat?</a>
    <ul>
      <li><a href="#cómo-puedo-encontrar-personas-con-las-que-chatear">¿Cómo puedo encontrar personas con las que chatear?</a></li>
@@ -597,16 +597,16 @@ to any system involved in the delivery of Push Notifications.</p>

 <ul>
  <li>
-    <p>A Delta Chat app obtains a “device token” locally and stores it
+    <p>A Delta Chat app obtains a “device token” locally, encrypts it and stores it
 on the <a href="https://delta.chat/chatmail">chatmail</a> server.</p>
  </li>
  <li>
    <p>When a <a href="https://delta.chat/chatmail">chatmail</a> server receives an e-mail for a Delta Chat user
-it forwards the “device token” to the central Delta Chat notification proxy.</p>
+it forwards the encrypted device token to the central Delta Chat notification proxy.</p>
  </li>
  <li>
-    <p>The central Delta Chat notification proxy forwards
-the “device token” to the respective Push service (Apple, Google, etc.),
+    <p>The central Delta Chat notification proxy decrypts the device token
+and forwards it to the respective Push service (Apple, Google, etc.),
 without ever knowing the IP or e-mail address of Delta Chat users.</p>
  </li>
  <li>
@@ -619,14 +619,15 @@ and also never see any message content (also not in encrypted forms).</p>
  </li>
 </ul>

-<p>As of May 2024, chatmail servers know about “device tokens”
-but we plan to encrypt this information to the notification proxy
-such that the chatmail server never learns the device token.</p>
-
 <p>The central Delta Chat notification proxy <a href="https://github.com/deltachat/notifiers">is small and fully implemented in Rust</a>
 and forgets about device-tokens as soon as Apple/Google/etc processed them,
 usually in a matter of milliseconds.</p>

+<p>Note that the device token is encrypted between apps and notification proxy
+but it is not signed. 
+The notification proxy thus never sees e-mail addresses, IP-addresses or
+any cryptographic identity information associated with a user’s device (token).</p>
+
 <p>Resulting from this overall privacy design, even the seizure of a chatmail server,
 or the full seizure of the central Delta Chat notification proxy
 would not reveal private information that Push services do not already have.</p>
@@ -871,7 +872,7 @@ and GnuPG (GPG), a command line tool implementing OpenPGP.
 Many public critiques of OpenPGP actually discuss GnuPG which Delta Chat has never used. 
 Delta Chat rather uses the OpenPGP Rust implementation <a href="https://github.com/rpgp/rpgp">rPGP</a>,
 available as <a href="https://crates.io/crates/pgp">an independent “pgp” package</a>,
-and <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">security-audited in 2019</a>.</p>
+and <a href="#security-audits">security-audited in 2019 and 2024</a>.</p>

 <p>We aim, along with other OpenPGP implementors, 
 to further improve security characteristics by implementing the
@@ -1166,10 +1167,25 @@ For other programs, you should be able to find a solution online.</p>
        
      </h3>

-<p>The Delta Chat project underwent four independent security audits and one
-independent security analysis, from most recent to older:</p>
+<p>Yes, multiple times. 
+The Delta Chat project continuously undergoes independent security audits and analysis,
+from most recent to older:</p>

 <ul>
+  <li>
+    <p>2024 December, an <a href="https://github.com/rpgp/docs/blob/main/audits/NGI%20Core%20rPGP%20penetration%20test%20report%202024%201.0.pdf">NLNET-commissioned Evaluation of
+rPGP</a> by <a href="https://www.radicallyopensecurity.com/">Radically Open Security</a> took place.
+rPGP serves as the end-to-end encyption <a href="https://openpgp.org">OpenPGP</a> engine of Delta Chat. 
+Two advisories were released related to the findings of this audit:</p>
+
+    <ul>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-9rmp-2568-59rv">“Panics on Malformed Untrusted Input”</a> CVE-2024-53856</li>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-4grw-m28r-q285">“Potential Resource Exhaustion when handling Untrusted Messages”</a> CVE-2024-53857</li>
+    </ul>
+
+    <p>The issues outlined in these advisories have been fixed and are part of Delta Chat 
+releases on all appstores since December 2024.</p>
+  </li>
  <li>
    <p>2024 March, we received a deep security analysis from the Applied Cryptography
 research group at ETH Zuerich and addressed all raised issues. 
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html><head><meta charset="UTF-8" /><meta name="viewport" content="initial-scale=1.0" /><link rel="stylesheet" href="../help.css" /></head><body><ul id="top">
+<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="#comment-puis-je-trouver-des-gens-avec-qui-discuter-">Comment puis-je trouver des gens avec qui discuter ?</a></li>
@@ -8,7 +8,7 @@
      <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="#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/Signature/Status/Motto with Delta Chat?</a></li>
+      <li><a href="#signature">Puis-je afficher une Bio/Signature ou un Status/Motto 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="#que-signifie-le-point-vert-">Que signifie le point vert ?</a></li>
      <li><a href="#ephemeralmsgs">How do disappearing messages work?</a></li>
@@ -115,14 +115,14 @@
        
      </h2>

-<p>Delta Chat is a reliable, decentralized and secure 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 les plateformes smartphone et ordinateurs de bureau.</p>

-<p>Delta Chat feels like Whatsapp or Telegram but you can also use and regard it as an e-mail app. 
-You can signup anonymously to a variety of <a href="https://delta.chat/chatmail">interoperable chatmail servers</a>
-which are minimal e-mail servers optimized for fast and secure operations. 
-Or you may use classic e-mail servers and an existing e-mail account
-in which case Delta Chat acts as an e-mail app.</p>
+<p>Delta Chat ressemble à Whatsapp ou Telegram mais vous pouvez aussi l’utiliser et la considérer comme une application e-mail. 
+Vous pouvez vous inscrire anonymement à une variété <a href="https://delta.chat/chatmail">de serveurs chatmail interéopérables</a>
+Qui sont des serveurs e-mails minimalistes optimisés pour des opérations rapides et sécurisées. 
+Ou vous pouvez utiliser des serveurs e-mail classiques et utiliser votre compte e-mail
+dans ce cas Delta Chat agit comme une application de courriel.</p>

 <p><img style="float:right; width:50%; max-width:360%; margin:1em;" src="../delta-what-optim.png" /></p>
    
@@ -134,15 +134,15 @@ in which case Delta Chat acts as an e-mail app.</p>
        
      </h3>

-<p>To securely setup contact with others <a href="#howtoe2ee">scan an invite QR code 
-or share an invite link</a>. 
-This is required when using a (default) chatmail-based chat profile 
-because chatmail servers reject un-encrypted outgoing messages.</p>
+<p>Pour établir un contact en toute sécurité avec d’autres personnes <a href="#howtoe2ee">scanner un code QR d’invitation 
+ou partager un lien d’invitation</a>. 
+Cette opération est nécessaire lors de l’utilisation d’un profil de discussion basé sur le chatmail (par défaut). 
+car les serveurs de chatmail rejettent les messages sortants non chiffrés.</p>

-<p>If you create a chat profile with a classic e-mail address 
-you may manually create a contact if you know their e-mail address
-and then write a message to them 
-even if the recipient is not using Delta Chat.</p>
+<p>Si vous créez un profil discussion avec une adresse courriel classique 
+vous pouvez créer manuellement un contact si vous connaissez son adresse courriel 
+et lui écrire un message 
+même si le destinataire n’utilise pas Delta Chat.</p>
    
      <h3 id="quels-sont-les-avantages-de-delta-chat-par-rapport-aux-autres-messageries-">
        
@@ -154,23 +154,23 @@ even if the recipient is not using Delta Chat.</p>

 <ul>
  <li>
-    <p>Anonymous chat profiles with fast, secure and interoperable <a href="https://delta.chat/chatmail">chatmail servers</a>
-which offer instant Push Notifications for iOS and Android devices.</p>
+    <p>Profils anonymes de discussion avec des <a href="https://delta.chat/chatmail">serveurs de chatmail</a> rapides, sécurisés et interopérables 
+qui offrent des notifications push instantanées pour les appareils iOS et Android.</p>
  </li>
  <li>
-    <p>Pervasive <a href="#multiple-accounts">multi-profile</a> and multi-device support on all platforms.</p>
+    <p>Fonctionnalités de <a href="#multiple-accounts">multi-profil</a> et de multi-appareil supportées sur toutes les plateformes.</p>
  </li>
  <li>
-    <p>Interactive <a href="https://webxdc.org/apps">web apps in chats</a> for gaming and collaboration</p>
+    <p><a href="https://webxdc.org/apps">web apps dans les chats</a> interactifs pour le gaming et la collaboration</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> 
+contre les attaques ciblées sur le réseau et les serveurs.</p>
  </li>
  <li>
-    <p>Free and Open Source software, both app and server side. 
-Built on <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md">E-mail and Web Internet Standards</a>, 
-<a href="https://xkcd.com/927/">to avoid “yet another standard syndrome (xkcd 927)”</a></p>
+    <p>Logiciel libre et open source, à la fois appli et côté serveur. 
+Construit sur des <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md">Standards d’Internet et d’e-mail</a>, 
+<a href="https://xkcd.com/927/">pour éviter le syndrome du “standard de plus” (xkcd 927)</a></p>
  </li>
 </ul>
    
@@ -256,16 +256,16 @@ that tend to cause unsolicited messages (“spam”) sooner or later.</p>
      <h3 id="signature">
        
        
-          Can I set a Bio/Signature/Status/Motto with Delta Chat? <a href="#signature" class="anchor"></a>
+          Puis-je afficher une Bio/Signature ou un Status/Motto avec Delta Chat? <a href="#signature" class="anchor"></a>
        
        
      </h3>

-<p>Yes,
-you can do so under <strong>Settings → Profile → Bio</strong>.
-Your contacts who use Delta Chat will see it
-when they view your contact details.
-Moreover, it will appear as a classic e-mail signature.</p>
+<p>Oui,
+vous pouvez le faire sous <strong>Paramètres → Profil → Bio</strong>.
+Vos contacts qui utilisent Delta Chat le verront
+lorsqu’ils consulteront vos coordonnées.
+De plus, elle apparaîtra sous la forme d’une signature classique sur vos courriels.</p>
    
      <h3 id="que-signifient-épingler-sourdine-et-archiver-">
        
@@ -578,16 +578,16 @@ to any system involved in the delivery of Push Notifications.</p>

 <ul>
  <li>
-    <p>A Delta Chat app obtains a “device token” locally and stores it
+    <p>A Delta Chat app obtains a “device token” locally, encrypts it and stores it
 on the <a href="https://delta.chat/chatmail">chatmail</a> server.</p>
  </li>
  <li>
    <p>When a <a href="https://delta.chat/chatmail">chatmail</a> server receives an e-mail for a Delta Chat user
-it forwards the “device token” to the central Delta Chat notification proxy.</p>
+it forwards the encrypted device token to the central Delta Chat notification proxy.</p>
  </li>
  <li>
-    <p>The central Delta Chat notification proxy forwards
-the “device token” to the respective Push service (Apple, Google, etc.),
+    <p>The central Delta Chat notification proxy decrypts the device token
+and forwards it to the respective Push service (Apple, Google, etc.),
 without ever knowing the IP or e-mail address of Delta Chat users.</p>
  </li>
  <li>
@@ -600,14 +600,15 @@ and also never see any message content (also not in encrypted forms).</p>
  </li>
 </ul>

-<p>As of May 2024, chatmail servers know about “device tokens”
-but we plan to encrypt this information to the notification proxy
-such that the chatmail server never learns the device token.</p>
-
 <p>The central Delta Chat notification proxy <a href="https://github.com/deltachat/notifiers">is small and fully implemented in Rust</a>
 and forgets about device-tokens as soon as Apple/Google/etc processed them,
 usually in a matter of milliseconds.</p>

+<p>Note that the device token is encrypted between apps and notification proxy
+but it is not signed. 
+The notification proxy thus never sees e-mail addresses, IP-addresses or
+any cryptographic identity information associated with a user’s device (token).</p>
+
 <p>Resulting from this overall privacy design, even the seizure of a chatmail server,
 or the full seizure of the central Delta Chat notification proxy
 would not reveal private information that Push services do not already have.</p>
@@ -868,7 +869,7 @@ and GnuPG (GPG), a command line tool implementing OpenPGP.
 Many public critiques of OpenPGP actually discuss GnuPG which Delta Chat has never used. 
 Delta Chat rather uses the OpenPGP Rust implementation <a href="https://github.com/rpgp/rpgp">rPGP</a>,
 available as <a href="https://crates.io/crates/pgp">an independent “pgp” package</a>,
-and <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">security-audited in 2019</a>.</p>
+and <a href="#security-audits">security-audited in 2019 and 2024</a>.</p>

 <p>We aim, along with other OpenPGP implementors, 
 to further improve security characteristics by implementing the
@@ -1170,10 +1171,25 @@ Pour les autres programmes, vous devriez pouvoir trouver la solution en ligne.</
        
      </h3>

-<p>The Delta Chat project underwent four independent security audits and one
-independent security analysis, from most recent to older:</p>
+<p>Yes, multiple times. 
+The Delta Chat project continuously undergoes independent security audits and analysis,
+from most recent to older:</p>

 <ul>
+  <li>
+    <p>2024 December, an <a href="https://github.com/rpgp/docs/blob/main/audits/NGI%20Core%20rPGP%20penetration%20test%20report%202024%201.0.pdf">NLNET-commissioned Evaluation of
+rPGP</a> by <a href="https://www.radicallyopensecurity.com/">Radically Open Security</a> took place.
+rPGP serves as the end-to-end encyption <a href="https://openpgp.org">OpenPGP</a> engine of Delta Chat. 
+Two advisories were released related to the findings of this audit:</p>
+
+    <ul>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-9rmp-2568-59rv">“Panics on Malformed Untrusted Input”</a> CVE-2024-53856</li>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-4grw-m28r-q285">“Potential Resource Exhaustion when handling Untrusted Messages”</a> CVE-2024-53857</li>
+    </ul>
+
+    <p>The issues outlined in these advisories have been fixed and are part of Delta Chat 
+releases on all appstores since December 2024.</p>
+  </li>
  <li>
    <p>2024 March, we received a deep security analysis from the Applied Cryptography
 research group at ETH Zuerich and addressed all raised issues. 
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html><head><meta charset="UTF-8" /><meta name="viewport" content="initial-scale=1.0" /><link rel="stylesheet" href="../help.css" /></head><body><ul id="top">
+<html lang="id"><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="#apa-itu-delta-chat">Apa itu Delta Chat?</a>
    <ul>
      <li><a href="#bagaimana-saya-bisa-menemukan-orang-untuk-diajak-ngobrol">Bagaimana Saya bisa menemukan orang untuk diajak ngobrol?</a></li>
@@ -603,16 +603,16 @@ to any system involved in the delivery of Push Notifications.</p>

 <ul>
  <li>
-    <p>A Delta Chat app obtains a “device token” locally and stores it
+    <p>A Delta Chat app obtains a “device token” locally, encrypts it and stores it
 on the <a href="https://delta.chat/chatmail">chatmail</a> server.</p>
  </li>
  <li>
    <p>When a <a href="https://delta.chat/chatmail">chatmail</a> server receives an e-mail for a Delta Chat user
-it forwards the “device token” to the central Delta Chat notification proxy.</p>
+it forwards the encrypted device token to the central Delta Chat notification proxy.</p>
  </li>
  <li>
-    <p>The central Delta Chat notification proxy forwards
-the “device token” to the respective Push service (Apple, Google, etc.),
+    <p>The central Delta Chat notification proxy decrypts the device token
+and forwards it to the respective Push service (Apple, Google, etc.),
 without ever knowing the IP or e-mail address of Delta Chat users.</p>
  </li>
  <li>
@@ -625,14 +625,15 @@ and also never see any message content (also not in encrypted forms).</p>
  </li>
 </ul>

-<p>As of May 2024, chatmail servers know about “device tokens”
-but we plan to encrypt this information to the notification proxy
-such that the chatmail server never learns the device token.</p>
-
 <p>The central Delta Chat notification proxy <a href="https://github.com/deltachat/notifiers">is small and fully implemented in Rust</a>
 and forgets about device-tokens as soon as Apple/Google/etc processed them,
 usually in a matter of milliseconds.</p>

+<p>Note that the device token is encrypted between apps and notification proxy
+but it is not signed. 
+The notification proxy thus never sees e-mail addresses, IP-addresses or
+any cryptographic identity information associated with a user’s device (token).</p>
+
 <p>Resulting from this overall privacy design, even the seizure of a chatmail server,
 or the full seizure of the central Delta Chat notification proxy
 would not reveal private information that Push services do not already have.</p>
@@ -893,7 +894,7 @@ and GnuPG (GPG), a command line tool implementing OpenPGP.
 Many public critiques of OpenPGP actually discuss GnuPG which Delta Chat has never used. 
 Delta Chat rather uses the OpenPGP Rust implementation <a href="https://github.com/rpgp/rpgp">rPGP</a>,
 available as <a href="https://crates.io/crates/pgp">an independent “pgp” package</a>,
-and <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">security-audited in 2019</a>.</p>
+and <a href="#security-audits">security-audited in 2019 and 2024</a>.</p>

 <p>We aim, along with other OpenPGP implementors, 
 to further improve security characteristics by implementing the
@@ -1203,10 +1204,25 @@ For other programs, you should be able to find a solution online.</p>
        
      </h3>

-<p>The Delta Chat project underwent four independent security audits and one
-independent security analysis, from most recent to older:</p>
+<p>Yes, multiple times. 
+The Delta Chat project continuously undergoes independent security audits and analysis,
+from most recent to older:</p>

 <ul>
+  <li>
+    <p>2024 December, an <a href="https://github.com/rpgp/docs/blob/main/audits/NGI%20Core%20rPGP%20penetration%20test%20report%202024%201.0.pdf">NLNET-commissioned Evaluation of
+rPGP</a> by <a href="https://www.radicallyopensecurity.com/">Radically Open Security</a> took place.
+rPGP serves as the end-to-end encyption <a href="https://openpgp.org">OpenPGP</a> engine of Delta Chat. 
+Two advisories were released related to the findings of this audit:</p>
+
+    <ul>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-9rmp-2568-59rv">“Panics on Malformed Untrusted Input”</a> CVE-2024-53856</li>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-4grw-m28r-q285">“Potential Resource Exhaustion when handling Untrusted Messages”</a> CVE-2024-53857</li>
+    </ul>
+
+    <p>The issues outlined in these advisories have been fixed and are part of Delta Chat 
+releases on all appstores since December 2024.</p>
+  </li>
  <li>
    <p>2024 March, we received a deep security analysis from the Applied Cryptography
 research group at ETH Zuerich and addressed all raised issues. 
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html><head><meta charset="UTF-8" /><meta name="viewport" content="initial-scale=1.0" /><link rel="stylesheet" href="../help.css" /></head><body><ul id="top">
+<html lang="it"><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="#cosè-delta-chat">Cos’è Delta Chat?</a>
    <ul>
      <li><a href="#come-posso-trovare-persone-con-cui-messaggiare">Come posso trovare persone con cui messaggiare?</a></li>
@@ -597,17 +597,15 @@ a qualsiasi sistema coinvolto nella consegna di Notifiche Push.</p>

 <ul>
  <li>
-    <p>Un’app Delta Chat ottiene un “gettone del dispositivo” localmente e lo memorizza
-sul server <a href="https://delta.chat/chatmail">chatmail</a>.</p>
+    <p>Un’app Delta Chat ottiene un “token del dispositivo” localmente, lo crittografa e lo memorizza sul server <a href="https://delta.chat/chatmail">chatmail</a>.</p>
  </li>
  <li>
-    <p>Quando un server <a href="https://delta.chat/chatmail">chatmail</a> riceve un’e-mail per un utente Delta Chat
-inoltra il “gettone del dispositivo” al proxy di notifica centrale di Delta Chat.</p>
+    <p>Quando un server <a href="https://delta.chat/chatmail">chatmail</a> riceve un’e-mail per un utente Delta Chat, inoltra il token del dispositivo crittografato al proxy di notifica centrale Delta Chat.</p>
  </li>
  <li>
-    <p>Il proxy di notifica centrale di Delta Chat inoltra
-il “gettone del dispositivo” al rispettivo servizio Push (Apple, Google, ecc.),
-senza mai conoscere l’IP o l’indirizzo e-mail degli utenti Delta Chat.</p>
+    <p>Il proxy di notifica centrale di Delta Chat decifra il token del dispositivo
+e lo inoltra al rispettivo servizio Push (Apple, Google, ecc.),
+senza mai conoscere l’IP o l’indirizzo e-mail degli utenti di Delta Chat.</p>
  </li>
  <li>
    <p>Il Servizio Push centrale (Apple, Google, ecc.)
@@ -619,14 +617,15 @@ e inoltre non vedono mai il contenuto del messaggio (anche non in forma crittogr
  </li>
 </ul>

-<p>A partire da Maggio 2024, i server chatmail conoscono i “gettoni del dispositivo”
-ma prevediamo di crittografare queste informazioni nel proxy di notifica
-in modo tale che il server chatmail non apprenda mai il gettone del dispositivo.</p>
-
 <p>Il proxy di notifica centrale di Delta Chat <a href="https://github.com/deltachat/notifiers">è piccolo e completamente implementato in Rust</a>
 e si dimentica dei gettoni del dispositivo non appena Apple/Google/ecc li elabora,
 di solito nel giro di pochi millisecondi.</p>

+<p>Si noti che il token del dispositivo è crittografato tra le app e il proxy di notifica
+ma non è firmato.
+Il proxy di notifica quindi non vede mai indirizzi e-mail, indirizzi IP o
+alcune informazioni di identità crittografica associate al dispositivo di un utente (token).</p>
+
 <p>Come risultato di questo disegno complessivo sulla riservatezza, anche il sequestro di un server chatmail,
 o il sequestro totale del proxy di notifica centrale di Delta Chat
 non rivelerebbe informazioni private che i servizi Push non abbiano già.</p>
@@ -875,14 +874,13 @@ se l’intero messaggio è crittografato e firmato correttamente.
 Ad esempio, le “Firme distaccate” non sono considerate sicure.</p>

 <p>OpenPGP non è insicuro di per sé.
-I problemi di sicurezza di OpenPGP più discussi pubblicamente
-in realtà derivano da una cattiva usabilità o da cattive implementazioni di strumenti o app (o entrambi).
+La maggior parte dei problemi di sicurezza di OpenPGP discussi pubblicamentederivano in realtà da una cattiva usabilità o da cattive implementazioni di strumenti o app (o entrambi).
 È particolarmente importante distinguere tra OpenPGP, lo standard di crittografia IETF,
 e GnuPG (GPG), uno strumento da riga di comando che implementa OpenPGP.
 Molte critiche pubbliche di OpenPGP in realtà discutono di GnuPG che Delta Chat non ha mai utilizzato.
-Delta Chat utilizza piuttosto l’implementazione OpenPGP Rust <a href="https://github.com/rpgp/rpgp">rPGP</a>,
+Delta Chat utilizza piuttosto l’implementazione Rust di OpenPGP <a href="https://github.com/rpgp/rpgp">rPGP</a>,
 disponibile come <a href="https://crates.io/crates/pgp">un pacchetto “pgp” indipendente</a>,
-e <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">controllato sulla sicurezza nel 2019</a>.</p>
+e <a href="#security-audits">verificato per la sicurezza nel 2019 e nel 2024</a>.</p>

 <p>Puntiamo, insieme ad altri implementatori di OpenPGP,
 per migliorare ulteriormente le caratteristiche di sicurezza implementando il
@@ -947,7 +945,7 @@ compresi eventuali allegati,
 se non sono crittografati end-to-end.</p>

 <p>Delta Chat per impostazione predefinita utilizza
-[Crittografia TLS] rigorosa (https://en.wikipedia.org/wiki/Transport_Layer_Security)
+<a href="https://en.wikipedia.org/wiki/Transport_Layer_Security">Crittografia TLS</a> rigorosa 
 che protegge le connessioni tra il tuo dispositivo e il tuo provider e-mail.
 Tutta la gestione TLS di Delta Chat è stata sottoposta a <a href="#security-audits">controlli di sicurezza</a> in modo indipendente.
 Inoltre, la connessione tra il tuo provider e-mail e quello del destinatario
@@ -1191,10 +1189,26 @@ Per altri programmi, dovresti essere in grado di trovare una soluzione online.</
        
      </h3>

-<p>Il progetto Delta Chat è stato sottoposto a quattro controlli di sicurezza indipendenti e
-un’analisi di sicurezza indipendente, dal più recente al più vecchio:</p>
+<p>Sì, più volte.
+Il progetto Delta Chat è sottoposto costantemente a verifiche e analisi di sicurezza indipendenti,
+dal più recente al più vecchio:</p>

 <ul>
+  <li>
+    <p>Dicembre 2024, un <a href="https://github.com/rpgp/docs/blob/main/audits/NGI%20Core%20rPGP%20penetration%20test%20report%202024%201.0.pdf">Valutazione commissionata da NLNET di
+rPGP</a> di <a href="https://www.radicallyopensecurity.com/">Radically Open Security</a> ha preso parte.
+rPGP serves as the end-to-end encyption <a href="https://openpgp.org">OpenPGP</a> engine of Delta Chat. 
+Sono stati rilasciati due avvisi relativi ai risultati di questa verifica:</p>
+
+    <ul>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-9rmp-2568-59rv">“Panico per Input non Attendibili e Malformati”</a> CVE-2024-53856</li>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-4grw-m28r-q285">“Potenziale Esaurimento delle Risorse durante la gestione di Messaggi non Attendibili”</a> CVE-2024-53857</li>
+    </ul>
+
+    <p>I problemi descritti in questi avvisi sono stati risolti e fanno
+parte delle versioni di Delta Chat
+su tutti gli appstore da Dicembre 2024.</p>
+  </li>
  <li>
    <p>Marzo 2024, abbiamo ricevuto un’analisi approfondita della sicurezza dalla Crittografia Applicata
 gruppo di ricerca dell’ETH di Zurigo e ha affrontato tutte le questioni sollevate. 
@@ -1911,7 +1925,7 @@ tramite <a href="https://autocrypt.org">Autocrypt</a>.</p>
 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 [Rapporto Needfinding e UX] conclusivo (https://delta.chat/en/2019-07-19-uxreport).
+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>
@@ -1935,7 +1949,7 @@ e fornendo “inserimento immediato” in tutte le app rilasciate da aprile 2024
  </li>
  <li>
    <p>Nel 2023 e nel 2024 siamo stati accettati nel programma Next Generation Internet (NGI)
-per il nostro lavoro in [webxdc PUSH].(https://nlnet.nl/project/WebXDC-Push/),
+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>, 
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html><head><meta charset="UTF-8" /><meta name="viewport" content="initial-scale=1.0" /><link rel="stylesheet" href="../help.css" /></head><body><ul id="top">
+<html lang="nl"><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="#wat-is-delta-chat">Wat is Delta Chat?</a>
    <ul>
      <li><a href="#hoe-kan-ik-gesprekspartners-vinden">Hoe kan ik gesprekspartners vinden?</a></li>
@@ -597,16 +597,16 @@ to any system involved in the delivery of Push Notifications.</p>

 <ul>
  <li>
-    <p>A Delta Chat app obtains a “device token” locally and stores it
+    <p>A Delta Chat app obtains a “device token” locally, encrypts it and stores it
 on the <a href="https://delta.chat/chatmail">chatmail</a> server.</p>
  </li>
  <li>
    <p>When a <a href="https://delta.chat/chatmail">chatmail</a> server receives an e-mail for a Delta Chat user
-it forwards the “device token” to the central Delta Chat notification proxy.</p>
+it forwards the encrypted device token to the central Delta Chat notification proxy.</p>
  </li>
  <li>
-    <p>The central Delta Chat notification proxy forwards
-the “device token” to the respective Push service (Apple, Google, etc.),
+    <p>The central Delta Chat notification proxy decrypts the device token
+and forwards it to the respective Push service (Apple, Google, etc.),
 without ever knowing the IP or e-mail address of Delta Chat users.</p>
  </li>
  <li>
@@ -619,14 +619,15 @@ and also never see any message content (also not in encrypted forms).</p>
  </li>
 </ul>

-<p>As of May 2024, chatmail servers know about “device tokens”
-but we plan to encrypt this information to the notification proxy
-such that the chatmail server never learns the device token.</p>
-
 <p>The central Delta Chat notification proxy <a href="https://github.com/deltachat/notifiers">is small and fully implemented in Rust</a>
 and forgets about device-tokens as soon as Apple/Google/etc processed them,
 usually in a matter of milliseconds.</p>

+<p>Note that the device token is encrypted between apps and notification proxy
+but it is not signed. 
+The notification proxy thus never sees e-mail addresses, IP-addresses or
+any cryptographic identity information associated with a user’s device (token).</p>
+
 <p>Resulting from this overall privacy design, even the seizure of a chatmail server,
 or the full seizure of the central Delta Chat notification proxy
 would not reveal private information that Push services do not already have.</p>
@@ -887,7 +888,7 @@ and GnuPG (GPG), a command line tool implementing OpenPGP.
 Many public critiques of OpenPGP actually discuss GnuPG which Delta Chat has never used. 
 Delta Chat rather uses the OpenPGP Rust implementation <a href="https://github.com/rpgp/rpgp">rPGP</a>,
 available as <a href="https://crates.io/crates/pgp">an independent “pgp” package</a>,
-and <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">security-audited in 2019</a>.</p>
+and <a href="#security-audits">security-audited in 2019 and 2024</a>.</p>

 <p>We aim, along with other OpenPGP implementors, 
 to further improve security characteristics by implementing the
@@ -1196,10 +1197,25 @@ Voor andere programma’s kun je zélf een oplossing zoeken op internet.</p>
        
      </h3>

-<p>The Delta Chat project underwent four independent security audits and one
-independent security analysis, from most recent to older:</p>
+<p>Yes, multiple times. 
+The Delta Chat project continuously undergoes independent security audits and analysis,
+from most recent to older:</p>

 <ul>
+  <li>
+    <p>2024 December, an <a href="https://github.com/rpgp/docs/blob/main/audits/NGI%20Core%20rPGP%20penetration%20test%20report%202024%201.0.pdf">NLNET-commissioned Evaluation of
+rPGP</a> by <a href="https://www.radicallyopensecurity.com/">Radically Open Security</a> took place.
+rPGP serves as the end-to-end encyption <a href="https://openpgp.org">OpenPGP</a> engine of Delta Chat. 
+Two advisories were released related to the findings of this audit:</p>
+
+    <ul>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-9rmp-2568-59rv">“Panics on Malformed Untrusted Input”</a> CVE-2024-53856</li>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-4grw-m28r-q285">“Potential Resource Exhaustion when handling Untrusted Messages”</a> CVE-2024-53857</li>
+    </ul>
+
+    <p>The issues outlined in these advisories have been fixed and are part of Delta Chat 
+releases on all appstores since December 2024.</p>
+  </li>
  <li>
    <p>2024 March, we received a deep security analysis from the Applied Cryptography
 research group at ETH Zuerich and addressed all raised issues. 
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html><head><meta charset="UTF-8" /><meta name="viewport" content="initial-scale=1.0" /><link rel="stylesheet" href="../help.css" /></head><body><ul id="top">
+<html lang="pl"><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="#czym-jest-delta-chat">Czym jest Delta Chat?</a>
    <ul>
      <li><a href="#jak-mogę-znaleźć-ludzi-z-którymi-mogę-czatować">Jak mogę znaleźć ludzi, z którymi mogę czatować?</a></li>
@@ -494,23 +494,23 @@ nadal będziesz mógł pisać, ale nie będziesz już powiadamiany o żadnych no

 <ul>
  <li>
-    <p>Aplikacja Delta Chat uzyskuje lokalnie „token urządzenia” i przechowuje go na serwerze <a href="https://delta.chat/chatmail">chatmail</a>.</p>
+    <p>Aplikacja Delta Chat uzyskuje lokalnie „token urządzenia”, szyfruje i przechowuje go na serwerze <a href="https://delta.chat/chatmail">chatmail</a>.</p>
  </li>
  <li>
-    <p>Kiedy serwer <a href="https://delta.chat/chatmail">chatmail</a> odbierze wiadomość e-mail od użytkownika Delta Chat, przekazuje „token urządzenia” do centralnego serwera proxy powiadomień Delta Chat.</p>
+    <p>Kiedy serwer <a href="https://delta.chat/chatmail">chatmail</a> odbierze wiadomość e-mail od użytkownika Delta Chat, przekazuje zaszyfrowany token urządzenia do centralnego serwera proxy powiadomień Delta Chat.</p>
  </li>
  <li>
-    <p>Centralny serwer proxy powiadomień Delta Chat przekazuje „token urządzenia” do odpowiedniej usługi Push (Apple, Google itp.), nie znając nawet adresu IP ani adresu e-mail użytkowników Delta Chat.</p>
+    <p>Centralny serwer proxy powiadomień Delta Chat deszyfruje token urządzenia i przekazuje go do odpowiedniej usługi Push (Apple, Google itp.), nie znając nawet adresu IP ani adresu e-mail użytkowników Delta Chat.</p>
  </li>
  <li>
    <p>Centralna usługa Push (Apple, Google itp.) budzi aplikację Delta Chat na twoim urządzeniu, aby sprawdzić w tle nowe wiadomości. Nie zna chatmaila ani adresu e-mail urządzenia, na którym się budzi. Centralne usługi push Apple/Google nigdy nie widzą adresu e-mail (nadawcy ani odbiorcy), a także nigdy nie widzą treści wiadomości (również w formie zaszyfrowanej).</p>
  </li>
 </ul>

-<p>Od maja 2024 r. serwery chatmail znają „tokeny urządzenia”, ale planujemy szyfrować te informacje na serwerze proxy powiadomień, tak aby serwer chatmail nigdy nie poznał tokena urządzenia.</p>
-
 <p>Centralny serwer proxy powiadomień Delta Chat <a href="https://github.com/deltachat/notifiers">jest mały i w pełni zaimplementowany w Rust</a> i zapomina o tokenach urządzeń zaraz po ich przetworzeniu przez Apple/Google/itp, zwykle w ciągu kilku milisekund.</p>

+<p>Pamiętaj, że token urządzenia jest szyfrowany między aplikacjami a serwerem proxy powiadomień, ale nie jest podpisany. Serwer proxy powiadomień nigdy nie widzi adresów e-mail, adresów IP ani żadnych kryptograficznych informacji identyfikujących powiązanych z urządzeniem użytkownika (tokenem).</p>
+
 <p>W wyniku tego ogólnego projektu ochrony prywatności nawet przejęcie serwera chatmail lub pełne przejęcie centralnego serwera proxy powiadomień Delta Chat nie spowodowałoby ujawnienia prywatnych informacji, których usługi Push jeszcze nie posiadają.</p>
    
      <h3 id="dlaczego-delta-chat-integruje-się-ze-scentralizowanymi-zastrzeżonymi-usługami-push-applegoogle">
@@ -669,7 +669,7 @@ nadal będziesz mógł pisać, ale nie będziesz już powiadamiany o żadnych no

 <p>Tak, Delta Chat korzysta z bezpiecznego podzbioru OpenPGP i wyświetla wskaźnik bezpieczeństwa kłódki na wiadomości tylko wtedy, gdy cała wiadomość jest prawidłowo zaszyfrowana i podpisana. Na przykład „Odłączone podpisy” nie są traktowane jako bezpieczne.</p>

-<p>OpenPGP samo w sobie nie jest niebezpieczne. Większość publicznie omawianych problemów związanych z bezpieczeństwem OpenPGP tak naprawdę wynika ze złej użyteczności lub złej implementacji narzędzi, lub aplikacji (lub obu). Szczególnie ważne jest rozróżnienie pomiędzy OpenPGP, standardem szyfrowania IETF, a GnuPG (GPG), narzędziem wiersza poleceń implementującym OpenPGP. Wiele publicznych komentarzy krytycznych na temat OpenPGP tak naprawdę omawia GnuPG, którego Delta Chat nigdy nie używał. Delta Chat korzysta raczej z implementacji OpenPGP Rust <a href="https://github.com/rpgp/rpgp">rPGP</a>, dostępnej jako <a href="https://crates.io/crates/pgp">niezależny pakiet „pgp”</a> i poddanej <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">audytowi bezpieczeństwa w 2019 roku</a>.</p>
+<p>OpenPGP samo w sobie nie jest niebezpieczne. Większość publicznie omawianych problemów związanych z bezpieczeństwem OpenPGP tak naprawdę wynika ze złej użyteczności lub złej implementacji narzędzi, lub aplikacji (lub obu). Szczególnie ważne jest rozróżnienie pomiędzy OpenPGP, standardem szyfrowania IETF, a GnuPG (GPG), narzędziem wiersza poleceń implementującym OpenPGP. Wiele publicznych komentarzy krytycznych na temat OpenPGP tak naprawdę omawia GnuPG, którego Delta Chat nigdy nie używał. Delta Chat korzysta raczej z implementacji OpenPGP Rust <a href="https://github.com/rpgp/rpgp">rPGP</a>, dostępnej jako <a href="https://crates.io/crates/pgp">niezależny pakiet „pgp”</a> i poddanej <a href="#security-audits">audytowi bezpieczeństwa w 2019 i 2024 roku</a>.</p>

 <p>Naszym celem, wraz z innymi wdrażającymi OpenPGP, jest dalsza poprawa parametrów bezpieczeństwa poprzez wdrożenie <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-crypto-refresh/">nowego IETF OpenPGP Crypto-Refresh</a>, który na szczęście został przyjęty latem 2023 roku.</p>
    
@@ -868,7 +868,18 @@ W przypadku innych programów można znaleźć rozwiązanie online.</p>
        
      </h3>

-<p>Projekt Delta Chat przeszedł cztery niezależne audyty bezpieczeństwa i jedną niezależną analizę bezpieczeństwa, od najnowszego do najstarszego:</p>
+<p>Tak, wielokrotnie.
+Projekt Delta Chat stale przechodzi niezależne audyty bezpieczeństwa i analizy,
+od najnowszych do najstarszych:</p>
+
+<p>W grudniu 2024 r. <a href="https://github.com/rpgp/docs/blob/main/audits/NGI%20Core%20rPGP%20penetration%20test%20report%202024%201.0.pdf">NLNET</a> wykonała ocenę rPGP zleconą przez <a href="https://www.radicallyopensecurity.com/">Radically Open Security</a>. rPGP służy jako kompleksowy silnik szyfrowania <a href="https://openpgp.org">OpenPGP</a> w Delta Chat. Wydano dwa ostrzeżenia związane z wynikami tego audytu:</p>
+
+<ul>
+  <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-9rmp-2568-59rv">„Paniki przy nieprawidłowym wprowadzaniu niezaufanych danych wejściowych”</a> CVE-2024-53856</li>
+  <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-4grw-m28r-q285">„Potencjalne wyczerpanie zasobów podczas obsługi niezaufanych wiadomości”</a> CVE-2024-53857</li>
+</ul>
+
+<p>Problemy opisane w tych ostrzeżeniach zostały naprawione i są częścią wydań Delta Chat we wszystkich sklepach z aplikacjami od grudnia 2024 r.</p>

 <ul>
  <li>
@@ -945,7 +956,7 @@ W przypadku innych programów można znaleźć rozwiązanie online.</p>
    <p>W systemie <strong>iOS</strong> upewnij się, że jest przydzielony dostęp do opcji „Ustawienia » Aplikacje » Delta Chat » <strong>Sieć lokalna</strong>”</p>
  </li>
  <li>
-    <p>W systemie <strong>macOS</strong> włącz „Ustawienia systemowe » Prywatność i bezpieczeństwo » <strong>Sieć lokalna</strong> » Delta Chat”</p>
+    <p>W systemie <strong>macOS</strong> włącz „Preferencje systemowe » Ochrona i prywatność » <strong>Sieć lokalna</strong> » Delta Chat”</p>
  </li>
  <li>
    <p>Twój system może mieć „zaporę ogniową”, o której wiadomo, że powoduje problemy (szczególnie w systemie Windows).
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html><head><meta charset="UTF-8" /><meta name="viewport" content="initial-scale=1.0" /><link rel="stylesheet" href="../help.css" /></head><body><ul id="top">
+<html lang="pt"><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="#o-que-é-o-delta-chat">O que é o Delta Chat</a>
    <ul>
      <li><a href="#como-encontro-as-pessoas-para-conversar">Como encontro as pessoas para conversar?</a></li>
@@ -597,16 +597,16 @@ to any system involved in the delivery of Push Notifications.</p>

 <ul>
  <li>
-    <p>A Delta Chat app obtains a “device token” locally and stores it
+    <p>A Delta Chat app obtains a “device token” locally, encrypts it and stores it
 on the <a href="https://delta.chat/chatmail">chatmail</a> server.</p>
  </li>
  <li>
    <p>When a <a href="https://delta.chat/chatmail">chatmail</a> server receives an e-mail for a Delta Chat user
-it forwards the “device token” to the central Delta Chat notification proxy.</p>
+it forwards the encrypted device token to the central Delta Chat notification proxy.</p>
  </li>
  <li>
-    <p>The central Delta Chat notification proxy forwards
-the “device token” to the respective Push service (Apple, Google, etc.),
+    <p>The central Delta Chat notification proxy decrypts the device token
+and forwards it to the respective Push service (Apple, Google, etc.),
 without ever knowing the IP or e-mail address of Delta Chat users.</p>
  </li>
  <li>
@@ -619,14 +619,15 @@ and also never see any message content (also not in encrypted forms).</p>
  </li>
 </ul>

-<p>As of May 2024, chatmail servers know about “device tokens”
-but we plan to encrypt this information to the notification proxy
-such that the chatmail server never learns the device token.</p>
-
 <p>The central Delta Chat notification proxy <a href="https://github.com/deltachat/notifiers">is small and fully implemented in Rust</a>
 and forgets about device-tokens as soon as Apple/Google/etc processed them,
 usually in a matter of milliseconds.</p>

+<p>Note that the device token is encrypted between apps and notification proxy
+but it is not signed. 
+The notification proxy thus never sees e-mail addresses, IP-addresses or
+any cryptographic identity information associated with a user’s device (token).</p>
+
 <p>Resulting from this overall privacy design, even the seizure of a chatmail server,
 or the full seizure of the central Delta Chat notification proxy
 would not reveal private information that Push services do not already have.</p>
@@ -887,7 +888,7 @@ and GnuPG (GPG), a command line tool implementing OpenPGP.
 Many public critiques of OpenPGP actually discuss GnuPG which Delta Chat has never used. 
 Delta Chat rather uses the OpenPGP Rust implementation <a href="https://github.com/rpgp/rpgp">rPGP</a>,
 available as <a href="https://crates.io/crates/pgp">an independent “pgp” package</a>,
-and <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">security-audited in 2019</a>.</p>
+and <a href="#security-audits">security-audited in 2019 and 2024</a>.</p>

 <p>We aim, along with other OpenPGP implementors, 
 to further improve security characteristics by implementing the
@@ -1197,10 +1198,25 @@ Para outros programas, você deveria achar uma solução online.</p>
        
      </h3>

-<p>The Delta Chat project underwent four independent security audits and one
-independent security analysis, from most recent to older:</p>
+<p>Yes, multiple times. 
+The Delta Chat project continuously undergoes independent security audits and analysis,
+from most recent to older:</p>

 <ul>
+  <li>
+    <p>2024 December, an <a href="https://github.com/rpgp/docs/blob/main/audits/NGI%20Core%20rPGP%20penetration%20test%20report%202024%201.0.pdf">NLNET-commissioned Evaluation of
+rPGP</a> by <a href="https://www.radicallyopensecurity.com/">Radically Open Security</a> took place.
+rPGP serves as the end-to-end encyption <a href="https://openpgp.org">OpenPGP</a> engine of Delta Chat. 
+Two advisories were released related to the findings of this audit:</p>
+
+    <ul>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-9rmp-2568-59rv">“Panics on Malformed Untrusted Input”</a> CVE-2024-53856</li>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-4grw-m28r-q285">“Potential Resource Exhaustion when handling Untrusted Messages”</a> CVE-2024-53857</li>
+    </ul>
+
+    <p>The issues outlined in these advisories have been fixed and are part of Delta Chat 
+releases on all appstores since December 2024.</p>
+  </li>
  <li>
    <p>2024 March, we received a deep security analysis from the Applied Cryptography
 research group at ETH Zuerich and addressed all raised issues. 
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html><head><meta charset="UTF-8" /><meta name="viewport" content="initial-scale=1.0" /><link rel="stylesheet" href="../help.css" /></head><body><ul id="top">
+<html lang="ru"><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="#что-такое-delta-chat">Что такое Delta Chat?</a>
    <ul>
      <li><a href="#как-мне-найти-людей-для-общения">Как мне найти людей для общения?</a></li>
@@ -118,7 +118,7 @@
 <p>Delta Chat — надежное, децентрализованное и безопасное приложение для обмена сообщениями,
 доступное для мобильных и настольных платформ.</p>

-<p>Delta Chat напоминает Whatsapp или Telegram, но его можно использовать и приложение электронной почты. 
+<p>Delta Chat напоминает Whatsapp или Telegram, но его можно использовать и как приложение электронной почты. 
 Вы можете анонимно зарегистрироваться на различных <a href="https://delta.chat/chatmail">совместимых с chatmail серверах</a>,
 которые представляют собой минимальные почтовые серверы, оптимизированные для быстрой и безопасной работы. 
 Или вы можете использовать обычные почтовые серверы и существующий почтовый аккаунт,
@@ -134,7 +134,7 @@
        
      </h3>

-<p>Чтобы безопасно настроить связь с другими <a href="#howtoe2ee">отсканируйте QR-код приглашения 
+<p>Чтобы безопасно настроить связь с другими, <a href="#howtoe2ee">отсканируйте QR-код приглашения 
 или поделитесь ссылкой-приглашением</a>.
 Это необходимо при использовании профиля чата на основе почты chatmail (по умолчанию), 
 потому что серверы chatmail отклоняют незашифрованные исходящие сообщения.</p>
@@ -600,16 +600,16 @@ Push-уведомления недоступны.</p>

 <ul>
  <li>
-    <p>Приложение Delta Chat локально получает “токен устройства” и сохраняет его
+    <p>Приложение Delta Chat локально получает “токен устройства” шифрует его и сохраняет
 на сервере <a href="https://delta.chat/chatmail">chatmail</a>.</p>
  </li>
  <li>
    <p>Когда сервер <a href="https://delta.chat/chatmail">chatmail</a> получает электронную почту для пользователя Delta Chat
-он пересылает “токен устройства” центральному прокси-серверу уведомлений Delta Chat.</p>
+он пересылает “зашифрованный токен устройства” центральному прокси-серверу уведомлений Delta Chat.</p>
  </li>
  <li>
-    <p>Центральный прокси-сервер уведомлений Delta Chat пересылает
-“токен устройства” в соответствующую службу Push (Apple, Google и т. д.),
+    <p>Центральный прокси-сервер уведомлений Delta Chat расшифровывает “токен устройства” и
+пересылает его в соответствующую службу Push (Apple, Google и т. д.),
 даже не зная IP-адрес или адрес электронной почты пользователей Delta Chat.</p>
  </li>
  <li>
@@ -622,14 +622,15 @@ Push-уведомления недоступны.</p>
  </li>
 </ul>

-<p>По состоянию на май 2024 года серверы chatmail знают о “токенах устройства”,
-но мы планируем зашифровать эту информацию для прокси-сервера уведомлений
-так, чтобы сервер chatmail не смог получить доступ к токену устройства.</p>
-
 <p>Центральный прокси-сервер уведомлений Delta Chat <a href="https://github.com/deltachat/notifiers">небольшой и полностью реализован на Rust</a>
 забывает о токенах устройств, как только Apple/Google/и т. д. обработали их,
 обычно за несколько миллисекунд.</p>

+<p>Обратите внимание, что токен устройства шифруется между приложениями и прокси-сервером уведомлений,
+но не подписывается. 
+Прокси-сервер уведомлений не получает доступ к адресам электронной почты, IP-адресам
+или криптографическим идентификационным данным устройства пользователя (токену).</p>
+
 <p>В результате такого общего подхода к обеспечению конфиденциальности, даже захват почтового сервера chatmail,
 или полный захват центрального прокси-сервера уведомлений Delta Chat
 не раскроет конфиденциальную информацию, которой сервисы Push уже не обладают.</p>
@@ -890,7 +891,7 @@ Autocrypt использует ограниченное и <a href="#openpgp-sec
 Многие публичные критические замечания по OpenPGP фактически касаются GnuPG, который Delta Chat никогда не использовал.
 Delta Chat вместо этого использует реализацию OpenPGP на Rust <a href="https://github.com/rpgp/rpgp">rPGP</a>,
 доступную как <a href="https://crates.io/crates/pgp">независимый пакет “pgp”</a>,
-и <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">проверенную на безопасность в 2019 году</a>.</p>
+и <a href="#security-audits">проверенную на безопасность в 2019 и 2024 годах</a>.</p>

 <p>Вместе с другими разработчиками OpenPGP мы стремимся, 
 повысить характеристики безопасности путём реализации
@@ -1200,10 +1201,25 @@ Delta Chat не будут иметь никакого ключа, прежде
        
      </h3>

-<p>Проект Delta Chat прошёл четыре независимых аудита безопасности и один
-независимый анализ безопасности, от самого последнего к более старому:</p>
+<p>Да, множество раз. 
+Проект Delta Chat находится в постоянном режиме аудита безопасности и анализа,
+от последних до более ранних:</p>

 <ul>
+  <li>
+    <p>Декабрь 2024 года, <a href="https://github.com/rpgp/docs/blob/main/audits/NGI%20Core%20rPGP%20penetration%20test%20report%202024%201.0.pdf">экспертиза rPGP, организованная
+ NLNET</a> выполненная <a href="https://www.radicallyopensecurity.com/">Radically Open Security</a>.
+rPGP является движком сквозного шифрования OpenPGP <a href="https://openpgp.org">OpenPGP</a> в Delta Chat. 
+В результате этого аудита были подготовлены два отчета по безопасности:</p>
+
+    <ul>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-9rmp-2568-59rv">“Паника при обработке некорректных, недоверенных входных данных”</a> CVE-2024-53856</li>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-4grw-m28r-q285">“Возможная нехватка ресурсов при обработке непроверенных сообщений”</a> CVE-2024-53857</li>
+    </ul>
+
+    <p>Проблемы, описанные в этих рекомендациях, были исправлены и включены в релизы Delta Chat, 
+во всех магазинах приложений с декабря 2024 года.</p>
+  </li>
  <li>
    <p>В марте 2024 года мы получили подробный анализ безопасности от исследовательской группы
 Applied Cryptography в ETH Цюрихе и устранили все выявленные проблемы. 
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html><head><meta charset="UTF-8" /><meta name="viewport" content="initial-scale=1.0" /><link rel="stylesheet" href="../help.css" /></head><body><ul id="top">
+<html lang="sk"><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="#čo-je-to-delta-chat">Čo je to Delta Chat?</a>
    <ul>
      <li><a href="#ako-nájdem-ľudí-s-ktorými-môžem-chatovať">Ako nájdem ľudí s ktorými môžem chatovať?</a></li>
@@ -603,16 +603,16 @@ to any system involved in the delivery of Push Notifications.</p>

 <ul>
  <li>
-    <p>A Delta Chat app obtains a “device token” locally and stores it
+    <p>A Delta Chat app obtains a “device token” locally, encrypts it and stores it
 on the <a href="https://delta.chat/chatmail">chatmail</a> server.</p>
  </li>
  <li>
    <p>When a <a href="https://delta.chat/chatmail">chatmail</a> server receives an e-mail for a Delta Chat user
-it forwards the “device token” to the central Delta Chat notification proxy.</p>
+it forwards the encrypted device token to the central Delta Chat notification proxy.</p>
  </li>
  <li>
-    <p>The central Delta Chat notification proxy forwards
-the “device token” to the respective Push service (Apple, Google, etc.),
+    <p>The central Delta Chat notification proxy decrypts the device token
+and forwards it to the respective Push service (Apple, Google, etc.),
 without ever knowing the IP or e-mail address of Delta Chat users.</p>
  </li>
  <li>
@@ -625,14 +625,15 @@ and also never see any message content (also not in encrypted forms).</p>
  </li>
 </ul>

-<p>As of May 2024, chatmail servers know about “device tokens”
-but we plan to encrypt this information to the notification proxy
-such that the chatmail server never learns the device token.</p>
-
 <p>The central Delta Chat notification proxy <a href="https://github.com/deltachat/notifiers">is small and fully implemented in Rust</a>
 and forgets about device-tokens as soon as Apple/Google/etc processed them,
 usually in a matter of milliseconds.</p>

+<p>Note that the device token is encrypted between apps and notification proxy
+but it is not signed. 
+The notification proxy thus never sees e-mail addresses, IP-addresses or
+any cryptographic identity information associated with a user’s device (token).</p>
+
 <p>Resulting from this overall privacy design, even the seizure of a chatmail server,
 or the full seizure of the central Delta Chat notification proxy
 would not reveal private information that Push services do not already have.</p>
@@ -893,7 +894,7 @@ and GnuPG (GPG), a command line tool implementing OpenPGP.
 Many public critiques of OpenPGP actually discuss GnuPG which Delta Chat has never used. 
 Delta Chat rather uses the OpenPGP Rust implementation <a href="https://github.com/rpgp/rpgp">rPGP</a>,
 available as <a href="https://crates.io/crates/pgp">an independent “pgp” package</a>,
-and <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">security-audited in 2019</a>.</p>
+and <a href="#security-audits">security-audited in 2019 and 2024</a>.</p>

 <p>We aim, along with other OpenPGP implementors, 
 to further improve security characteristics by implementing the
@@ -1203,10 +1204,25 @@ Pre iné programy by ste mali vedieť nájsť riešenie online.</p>
        
      </h3>

-<p>The Delta Chat project underwent four independent security audits and one
-independent security analysis, from most recent to older:</p>
+<p>Yes, multiple times. 
+The Delta Chat project continuously undergoes independent security audits and analysis,
+from most recent to older:</p>

 <ul>
+  <li>
+    <p>2024 December, an <a href="https://github.com/rpgp/docs/blob/main/audits/NGI%20Core%20rPGP%20penetration%20test%20report%202024%201.0.pdf">NLNET-commissioned Evaluation of
+rPGP</a> by <a href="https://www.radicallyopensecurity.com/">Radically Open Security</a> took place.
+rPGP serves as the end-to-end encyption <a href="https://openpgp.org">OpenPGP</a> engine of Delta Chat. 
+Two advisories were released related to the findings of this audit:</p>
+
+    <ul>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-9rmp-2568-59rv">“Panics on Malformed Untrusted Input”</a> CVE-2024-53856</li>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-4grw-m28r-q285">“Potential Resource Exhaustion when handling Untrusted Messages”</a> CVE-2024-53857</li>
+    </ul>
+
+    <p>The issues outlined in these advisories have been fixed and are part of Delta Chat 
+releases on all appstores since December 2024.</p>
+  </li>
  <li>
    <p>2024 March, we received a deep security analysis from the Applied Cryptography
 research group at ETH Zuerich and addressed all raised issues. 
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html><head><meta charset="UTF-8" /><meta name="viewport" content="initial-scale=1.0" /><link rel="stylesheet" href="../help.css" /></head><body><ul id="top">
+<html lang="sq"><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="#çështë-delta-chat-i">Ç’është Delta Chat-i?</a>
    <ul>
      <li><a href="#si-mund-të-gjej-persona-për-të-biseduar-me-ta">Si mund të gjej persona për të biseduar me ta?</a></li>
@@ -605,16 +605,16 @@ to any system involved in the delivery of Push Notifications.</p>

 <ul>
  <li>
-    <p>A Delta Chat app obtains a “device token” locally and stores it
+    <p>A Delta Chat app obtains a “device token” locally, encrypts it and stores it
 on the <a href="https://delta.chat/chatmail">chatmail</a> server.</p>
  </li>
  <li>
    <p>When a <a href="https://delta.chat/chatmail">chatmail</a> server receives an e-mail for a Delta Chat user
-it forwards the “device token” to the central Delta Chat notification proxy.</p>
+it forwards the encrypted device token to the central Delta Chat notification proxy.</p>
  </li>
  <li>
-    <p>The central Delta Chat notification proxy forwards
-the “device token” to the respective Push service (Apple, Google, etc.),
+    <p>The central Delta Chat notification proxy decrypts the device token
+and forwards it to the respective Push service (Apple, Google, etc.),
 without ever knowing the IP or e-mail address of Delta Chat users.</p>
  </li>
  <li>
@@ -627,14 +627,15 @@ and also never see any message content (also not in encrypted forms).</p>
  </li>
 </ul>

-<p>As of May 2024, chatmail servers know about “device tokens”
-but we plan to encrypt this information to the notification proxy
-such that the chatmail server never learns the device token.</p>
-
 <p>The central Delta Chat notification proxy <a href="https://github.com/deltachat/notifiers">is small and fully implemented in Rust</a>
 and forgets about device-tokens as soon as Apple/Google/etc processed them,
 usually in a matter of milliseconds.</p>

+<p>Note that the device token is encrypted between apps and notification proxy
+but it is not signed. 
+The notification proxy thus never sees e-mail addresses, IP-addresses or
+any cryptographic identity information associated with a user’s device (token).</p>
+
 <p>Resulting from this overall privacy design, even the seizure of a chatmail server,
 or the full seizure of the central Delta Chat notification proxy
 would not reveal private information that Push services do not already have.</p>
@@ -895,7 +896,7 @@ and GnuPG (GPG), a command line tool implementing OpenPGP.
 Many public critiques of OpenPGP actually discuss GnuPG which Delta Chat has never used. 
 Delta Chat rather uses the OpenPGP Rust implementation <a href="https://github.com/rpgp/rpgp">rPGP</a>,
 available as <a href="https://crates.io/crates/pgp">an independent “pgp” package</a>,
-and <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">security-audited in 2019</a>.</p>
+and <a href="#security-audits">security-audited in 2019 and 2024</a>.</p>

 <p>We aim, along with other OpenPGP implementors, 
 to further improve security characteristics by implementing the
@@ -1205,10 +1206,25 @@ Për programe të tjera, mund të gjeni një zgjidhje në internet.</p>
        
      </h3>

-<p>The Delta Chat project underwent four independent security audits and one
-independent security analysis, from most recent to older:</p>
+<p>Yes, multiple times. 
+The Delta Chat project continuously undergoes independent security audits and analysis,
+from most recent to older:</p>

 <ul>
+  <li>
+    <p>2024 December, an <a href="https://github.com/rpgp/docs/blob/main/audits/NGI%20Core%20rPGP%20penetration%20test%20report%202024%201.0.pdf">NLNET-commissioned Evaluation of
+rPGP</a> by <a href="https://www.radicallyopensecurity.com/">Radically Open Security</a> took place.
+rPGP serves as the end-to-end encyption <a href="https://openpgp.org">OpenPGP</a> engine of Delta Chat. 
+Two advisories were released related to the findings of this audit:</p>
+
+    <ul>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-9rmp-2568-59rv">“Panics on Malformed Untrusted Input”</a> CVE-2024-53856</li>
+      <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-4grw-m28r-q285">“Potential Resource Exhaustion when handling Untrusted Messages”</a> CVE-2024-53857</li>
+    </ul>
+
+    <p>The issues outlined in these advisories have been fixed and are part of Delta Chat 
+releases on all appstores since December 2024.</p>
+  </li>
  <li>
    <p>2024 March, we received a deep security analysis from the Applied Cryptography
 research group at ETH Zuerich and addressed all raised issues. 
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html><head><meta charset="UTF-8" /><meta name="viewport" content="initial-scale=1.0" /><link rel="stylesheet" href="../help.css" /></head><body><ul id="top">
+<html lang="uk"><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="#що-таке-delta-chat">Що таке Delta Chat?</a>
    <ul>
      <li><a href="#як-мені-знайти-людей-для-спілкування">Як мені знайти людей для спілкування?</a></li>
@@ -498,23 +498,23 @@ Push-сповіщення автоматично активуються для

 <ul>
  <li>
-    <p>Додаток Delta Chat отримує “токен пристрою” локально і зберігає його на сервері <a href="https://delta.chat/chatmail">chatmail</a>.</p>
+    <p>Додаток Delta Chat отримує “токен пристрою” локально, шифрує його і зберігає на сервері <a href="https://delta.chat/chatmail">chatmail</a>.</p>
  </li>
  <li>
-    <p>Коли <a href="https://delta.chat/chatmail">chatmail</a>-сервер отримує електронний лист від користувача Delta Chat він пересилає “токен пристрою” до центрального проксі-сповіщення Delta Chat.</p>
+    <p>Коли сервер <a href="https://delta.chat/chatmail">chatmail</a> отримує електронний лист від користувача Delta Chat він пересилає зашифрований токен пристрою до центрального проксі-сервера сповіщень Delta Chat.</p>
  </li>
  <li>
-    <p>Центральний проксі-сервер сповіщень Delta Chat пересилає “токен пристрою” до відповідного Push-сервісу (Apple, Google тощо), навіть не знаючи IP-адреси чи електронної пошти користувачів Delta Chat.</p>
+    <p>Центральний проксі-сервер сповіщень Delta Chat розшифровує токен пристрою і пересилає його до відповідного Push-сервісу (Apple, Google тощо), навіть не знаючи IP-адреси або електронної пошти користувачів Delta Chat.</p>
  </li>
  <li>
    <p>Центральний Push-сервіс (Apple, Google тощо) запускає додаток Delta Chat на вашому пристрої щоб перевірити наявність нових повідомлень у фоновому режимі. Він не знає про пошту чату або адресу електронної пошти пристрою, який він пробуджує. Центральні служби Apple/Google Push ніколи не бачать адресу електронної пошти (відправника або одержувача) а також ніколи не бачать жодного вмісту повідомлення (навіть в зашифрованому вигляді).</p>
  </li>
 </ul>

-<p>Станом на травень 2024 року chatmail-сервери знають про “токени пристроїв” але ми плануємо зашифрувати цю інформацію для проксі-сповіщень таким чином, щоб сервер чату ніколи не дізнався токен пристрою.</p>
-
 <p>Центральний проксі для сповіщень Delta Chat <a href="https://github.com/deltachat/notifiers">невеликий і повністю реалізований на Rust</a> забуває про токени пристроїв, як тільки Apple/Google/etc обробили їх, зазвичай за лічені мілісекунди.</p>

+<p>Зверніть увагу, що токен пристрою шифрується між програмами та проксі-сповіщеннями але не підписується. Таким чином, проксі-служба сповіщень ніколи не бачить адреси електронної пошти, IP-адреси або будь-яку криптографічну ідентифікаційну інформацію, пов’язану з пристроєм користувача (токеном).</p>
+
 <p>В результаті цього загального дизайну конфіденційності, навіть захоплення chatmail-сервера, або повне вилучення центрального проксі-сервера повідомлень Delta Chat не призведе до розкриття приватної інформації, якої ще не мають Push-сервіси.</p>
    
      <h3 id="чому-delta-chat-інтегрується-з-централізованими-пропрієтарними-push-сервісами-applegoogle">
@@ -676,7 +676,10 @@ Autocrypt використовує обмежену і <a href="#openpgp-secure"

 <p>Так, Delta Chat використовує безпечну підмножину OpenPGP і відображає індикатор безпеки у вигляді замка в повідомленні лише тоді, коли все повідомлення належним чином зашифровано і підписано. Наприклад, “Відокремлені підписи” не вважаються безпечними.</p>

-<p>OpenPGP не є небезпечним сам по собі. Більшість публічно обговорюваних проблем безпеки OpenPGP насправді виникають через погане використання або погану реалізацію інструментів або програм (або і те, і інше). Особливо важливо розрізняти OpenPGP, стандарт шифрування IETF, і GnuPG (GPG), інструментом командного рядка, що реалізує OpenPGP. Багато публічних критиків OpenPGP насправді обговорюють GnuPG, який Delta Chat ніколи не використовував. Натомість Delta Chat використовує реалізацію OpenPGP на Rust <a href="https://github.com/rpgp/rpgp">rPGP</a>, доступну як <a href="https://crates.io/crates/pgp">незалежний пакет “pgp”</a>, і <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">пройшов аудит безпеки у 2019 році</a>.</p>
+<p>OpenPGP сам по собі не є небезпечним. Більшість публічно обговорюваних проблем безпеки OpenPGP насправді виникають через недостатню зручність використання або погану реалізацію інструментів чи програм (або обох). 
+Особливо важливо розрізняти OpenPGP, стандарт шифрування IETF, і GnuPG (GPG), інструмент командного рядка, що реалізує OpenPGP. 
+Багато публічних критиків OpenPGP насправді обговорюють GnuPG, який Delta Chat ніколи не використовував. 
+Delta Chat скоріше використовує реалізацію OpenPGP Rust <a href="https://github.com/rpgp/rpgp">rPGP</a>, доступну як <a href="https://crates.io/crates/pgp">незалежний пакет «pgp»</a> і <a href="#security-audits">перевірку безпеки в 2019 і 2024 роках</a>.</p>

 <p>Ми прагнемо, разом з іншими розробниками OpenPGP, подальше покращення характеристик безпеки шляхом впровадження <a href="https://datatracker.ietf.org/doc/draft-ietf-openpgp-crypto-refresh/">нового IETF OpenPGP Crypto-Refresh</a> який, на щастя, був прийнятий влітку 2023 року.</p>
    
@@ -872,7 +875,17 @@ Look for something like <strong>Start Autocrypt Setup Transfer</strong> in the s
        
      </h3>

-<p>Проект Delta Chat пройшов чотири незалежні аудити безпеки та один незалежний аналіз безпеки, від найновіших до найстаріших:</p>
+<p>Так, багаторазово. Проект Delta Chat постійно проходить незалежні перевірки та аналіз безпеки, а саме, від останніх і закінчуючи старішими:</p>
+
+<ul>
+  <li>
+    <p>2024 грудня відбулася <a href="https://github.com/rpgp/docs/blob/main/audits/NGI%20Core%20rPGP%20penetration%20test%20report%202024%201.0.pdf">оцінка rPGP на замовлення NLNET</a> від <a href="https://www.radicallyopensecurity.com/">Radically Open Security</a>. rPGP слугує рушієм наскрізного шифрування <a href="https://openpgp.org">OpenPGP</a> для Delta Chat. За результатами цього аудиту було випущено дві рекомендації:</p>
+  </li>
+  <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-9rmp-2568-59rv">“Паніка через неправильне ненадійне введення”</a> CVE-2024-53856</li>
+  <li><a href="https://github.com/rpgp/rpgp/security/advisories/GHSA-4grw-m28r-q285">“Потенційне виснаження ресурсів під час обробки ненадійних повідомлень”</a> CVE-2024-53857</li>
+</ul>
+
+<p>Проблеми, описані в цих рекомендаціях, виправлено, і вони є частиною випусків Delta Chat у всіх магазинах додатків з грудня 2024 року.</p>

 <ul>
  <li>
@@ -35,7 +35,6 @@ public class DcAccounts {
    public native void            setPushDeviceToken   (String token);
    public native boolean         backgroundFetch      (int timeoutSeconds);

-    public native int             addAccount           ();
    public native int             migrateAccount       (String dbfile);
    public native boolean         removeAccount        (int accountId);
    public native int[]           getAll               ();
@@ -17,6 +17,7 @@ public class DcContext {
    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;
@@ -51,8 +52,8 @@ public class DcContext {
    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_BACKUP            = 251;
    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;
@@ -88,7 +89,7 @@ public class DcContext {
    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 DcAccounts.addAccount() instead
+    // when using DcAccounts, use Rpc.addAccount() instead
    public DcContext(String osName, String dbfile) {
        contextCPtr = createContextCPtr(osName, dbfile);
    }
@@ -137,7 +138,8 @@ public class DcContext {
    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) { try{return Integer.parseInt(getConfig(key));} catch(Exception e) {} return 0; }
+    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  ();
@@ -187,15 +189,17 @@ public class DcContext {
    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          prepareMsg           (int chat_id, DcMsg msg);
    public native int          sendMsg              (int chat_id, DcMsg msg);
    public native int          sendTextMsg          (int chat_id, String text);
    public native int          sendVideochatInvitation(int chat_id);
@@ -151,25 +151,25 @@ public class DcMsg {
    public native String  getWebxdcHref      ();
    public native boolean isForwarded        ();
    public native boolean isInfo             ();
-    public native boolean isSetupMessage     ();
    public native boolean hasHtml            ();
    public native String  getSetupCodeBegin  ();
    public native String  getVideochatUrl    ();
    public native int     getVideochatType   ();
-    public native boolean isIncreation       ();
    public native void    setText            (String text);
    public native void    setSubject         (String text);
    public native void    setHtml            (String text);
-    public native void    setFile            (String file, String filemime);
+    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 isOutgoing();
    public native int     getSenderColor();
+    public native boolean isEdited           ();

    public String getSenderName(DcContact dcContact) {
        String overrideName = getOverrideSenderName();
@@ -190,6 +190,14 @@ public class DcMsg {
      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() && getType() != DC_MSG_VIDEOCHAT_INVITATION;
+    }
+
    public File getFileAsFile() {
        if(getFile()==null)
            throw new AssertionError("expected a file to be present.");
@@ -209,6 +217,10 @@ public class DcMsg {
        return ids;
    }

+    public boolean isOutgoing() {
+        return getFromId() == DcContact.DC_CONTACT_ID_SELF;
+    }
+
    public String getDisplayBody()  {
        return getText();
    }
@@ -17,6 +17,7 @@ public class Rpc {
    private final Map<Integer, SettableFuture<JsonElement>> requestFutures = new ConcurrentHashMap<>();
    private final DcJsonrpcInstance dcJsonrpcInstance;
    private int requestId = 0;
+    private boolean started = false;
    private final Gson gson = new GsonBuilder().serializeNulls().create();

    public Rpc(DcJsonrpcInstance dcJsonrpcInstance) {
@@ -46,6 +47,7 @@ public class Rpc {
    }

    public void start() {
+        started = true;
        new Thread(() -> {
            while (true) {
                try {
@@ -57,7 +59,9 @@ public class Rpc {
        }, "jsonrpcThread").start();
    }

-    public SettableFuture<JsonElement> call(String method, Object... params) {
+    public SettableFuture<JsonElement> call(String method, Object... params) throws RpcException {
+        if (!started) throw new RpcException("RPC not started yet.");
+
        int id;
        synchronized (this) {
            id = ++requestId;
@@ -125,6 +129,10 @@ public class Rpc {
        return getResult("get_account_file_size", accountId).getAsInt();
    }

+    public int addAccount() throws RpcException {
+        return getResult("add_account").getAsInt();
+    }
+
    private static class Request {
        private final String jsonrpc = "2.0";
        public final String method;
@@ -26,6 +26,7 @@ import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEvent;
 import com.b44t.messenger.DcEventEmitter;
 import com.b44t.messenger.rpc.Rpc;
+import com.b44t.messenger.rpc.RpcException;

 import org.thoughtcrime.securesms.connect.AccountManager;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
@@ -109,6 +110,7 @@ public class ApplicationContext extends MultiDexApplication {

    dcAccounts = new DcAccounts(new File(getFilesDir(), "accounts").getAbsolutePath());
    rpc = new Rpc(dcAccounts.getJsonrpcInstance());
+    rpc.start();
    AccountManager.getInstance().migrateToDcAccounts(this);
    int[] allAccounts = dcAccounts.getAll();
    for (int accountId : allAccounts) {
@@ -124,12 +126,13 @@ public class ApplicationContext extends MultiDexApplication {
          e.printStackTrace();
        }
      }
-      if ("deltafans@nine.testrun.org".equals(ac.getConfig("configured_addr")) && !ac.isCommunity()) {
-          ac.setCommunityMode(true);
-      }
    }
    if (allAccounts.length == 0) {
-      dcAccounts.addAccount();
+      try {
+        rpc.addAccount();
+      } catch (RpcException e) {
+        e.printStackTrace();
+      }
    }
    dcContext = dcAccounts.getSelectedAccount();
    notificationCenter = new NotificationCenter(this);
@@ -146,8 +149,6 @@ public class ApplicationContext extends MultiDexApplication {
      Log.i("DeltaChat", "shutting down event handler");
    }, "eventThread").start();

-    rpc.start();
-
    // migrating global notifications pref. to per-account config, added  10/July/24
    final String NOTIFICATION_PREF = "pref_key_enable_notifications";
    boolean isMuted = !Prefs.getBooleanPreference(this, NOTIFICATION_PREF, true);
@@ -232,11 +233,10 @@ public class ApplicationContext extends MultiDexApplication {
            TimeUnit.MILLISECONDS)
            .setConstraints(constraints)
            .build();
-    try {
-      // in Android 4 this throws exception due to R8/shrinking
-      WorkManager.getInstance(this)
-        .enqueueUniquePeriodicWork("FetchWorker", ExistingPeriodicWorkPolicy.KEEP, fetchWorkRequest);
-    } catch (Throwable e) {}
+    WorkManager.getInstance(this).enqueueUniquePeriodicWork(
+            "FetchWorker",
+            ExistingPeriodicWorkPolicy.KEEP,
+            fetchWorkRequest);
    AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);

    if (Prefs.isPushEnabled(this)) {
@@ -17,22 +17,15 @@
 */
 package org.thoughtcrime.securesms;

-import android.annotation.TargetApi;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.os.Build.VERSION;
 import android.os.Bundle;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.NotificationManagerCompat;
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
@@ -51,9 +44,10 @@ import org.thoughtcrime.securesms.preferences.PrivacyPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.CorrectedPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.NotificationsPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.widgets.ProfilePreference;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.qr.BackupTransferActivity;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.IntentUtils;
+import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.ScreenLockUtil;

 /**
@@ -74,6 +68,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
  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;
@@ -153,6 +148,9 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
      this.findPreference(PREFERENCE_CATEGORY_ADVANCED)
        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_ADVANCED));

+      this.findPreference(PREFERENCE_CATEGORY_DONATE)
+          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_DONATE));
+
      this.findPreference(PREFERENCE_CATEGORY_HELP)
          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_HELP));

@@ -203,38 +201,6 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
          .setSummary(AdvancedPreferenceFragment.getVersion(getActivity()));
    }

-    @TargetApi(11)
-    private void tintIcons(Context context) {
-      Drawable notifications = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_notifications_white_24dp));
-      Drawable swap          = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_swap_vert_white_24dp));
-      Drawable appearance    = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_brightness_6_white_24dp));
-      Drawable chats         = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_forum_white_24dp));
-      Drawable privacy       = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_lock_white_24dp));
-      Drawable advanced      = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_advanced_white_24dp));
-      Drawable help          = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_help_white_24dp));
-
-      int[]      tintAttr   = new int[]{R.attr.pref_icon_tint};
-      TypedArray typedArray = context.obtainStyledAttributes(tintAttr);
-      int        color      = typedArray.getColor(0, 0x0);
-      typedArray.recycle();
-
-      DrawableCompat.setTint(notifications, color);
-      DrawableCompat.setTint(swap, color);
-      DrawableCompat.setTint(appearance, color);
-      DrawableCompat.setTint(chats, color);
-      DrawableCompat.setTint(privacy, color);
-      DrawableCompat.setTint(advanced, color);
-      DrawableCompat.setTint(help, color);
-
-      this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS).setIcon(notifications);
-      this.findPreference(PREFERENCE_CATEGORY_CONNECTIVITY).setIcon(swap);
-      this.findPreference(PREFERENCE_CATEGORY_APPEARANCE).setIcon(appearance);
-      this.findPreference(PREFERENCE_CATEGORY_CHATS).setIcon(chats);
-      this.findPreference(PREFERENCE_CATEGORY_PRIVACY).setIcon(privacy);
-      this.findPreference(PREFERENCE_CATEGORY_ADVANCED).setIcon(advanced);
-      this.findPreference(PREFERENCE_CATEGORY_HELP).setIcon(help);
-    }
-
    private class CategoryClickListener implements Preference.OnPreferenceClickListener {
      private final String category;

@@ -289,6 +255,9 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
        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;
@@ -1,9 +1,7 @@
 package org.thoughtcrime.securesms;

-import android.content.res.Configuration;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.ViewConfiguration;
@@ -18,9 +18,8 @@ import com.b44t.messenger.rpc.Rpc;

 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.ViewUtil;

 import java.util.HashSet;
 import java.util.Set;
@@ -11,19 +11,23 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.TypedArray;
+import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.Build;
 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;
 import androidx.appcompat.view.ActionMode;
 import androidx.core.content.ContextCompat;
+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;
@@ -33,6 +37,7 @@ import com.google.android.material.snackbar.Snackbar;
 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.RelayUtil;
 import org.thoughtcrime.securesms.util.SendRelayedMessageUtil;
 import org.thoughtcrime.securesms.util.Util;
@@ -316,9 +321,41 @@ public abstract class BaseConversationListFragment extends Fragment implements A
    updateActionModeItems(actionMode.getMenu());
  }

+  private void handleAddToHomeScreen() {
+    final Activity activity = requireActivity();
+    final DcContext dcContext = DcHelper.getContext(activity);
+    final Set<Long> selectedChats = getListAdapter().getBatchSelections();
+    final DcChat chat = dcContext.getChat(selectedChats.iterator().next().intValue());
+
+    Intent intent = new Intent(activity, ShareActivity.class);
+    intent.setAction(Intent.ACTION_SEND);
+    intent.putExtra(ShareActivity.EXTRA_ACC_ID, dcContext.getAccountId());
+    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;
+        }
+      });
+    });
+  }
+
  private void updateActionModeItems(Menu menu) {
    // We do not show action mode icons when relaying (= sharing or forwarding).
    if (!isRelayingMessageContent(requireActivity())) {
+      final int selectedCount = getListAdapter().getBatchSelections().size();
+      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);
@@ -376,13 +413,28 @@ public abstract class BaseConversationListFragment extends Fragment implements A

  @Override
  public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-    switch (item.getItemId()) {
-    case R.id.menu_select_all:       handleSelectAllThreads();   return true;
-    case R.id.menu_delete_selected:  handleDeleteAllSelected();  return true;
-    case R.id.menu_pin_selected:     handlePinAllSelected();     return true;
-    case R.id.menu_archive_selected: handleArchiveAllSelected(); return true;
-    case R.id.menu_mute_selected:    handleMuteAllSelected();    return true;
-    case R.id.menu_marknoticed_selected: handleMarknoticedSelected(); return true;
+    int itemId = item.getItemId();
+    if (itemId == R.id.menu_select_all) {
+      handleSelectAllThreads();
+      return true;
+    } else if (itemId == R.id.menu_delete_selected) {
+      handleDeleteAllSelected();
+      return true;
+    } else if (itemId == R.id.menu_pin_selected) {
+      handlePinAllSelected();
+      return true;
+    } else if (itemId == R.id.menu_archive_selected) {
+      handleArchiveAllSelected();
+      return true;
+    } else if (itemId == R.id.menu_mute_selected) {
+      handleMuteAllSelected();
+      return true;
+    } else if (itemId == R.id.menu_marknoticed_selected) {
+      handleMarknoticedSelected();
+      return true;
+    } else if (itemId == R.id.menu_add_to_home_screen) {
+      handleAddToHomeScreen();
+      return true;
    }

    return false;
@@ -25,6 +25,7 @@ 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);
@@ -1,20 +1,20 @@
 package org.thoughtcrime.securesms;

 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.appcompat.app.AlertDialog;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 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;
+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;

@@ -57,11 +57,10 @@ public class ContactMultiSelectionActivity extends ContactSelectionActivity {
  @Override
  public boolean onOptionsItemSelected(MenuItem item) {
    super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
-      case R.id.menu_add_members:
-        saveSelection();
-        finish();
-        return true;
+    if (item.getItemId() == R.id.menu_add_members) {
+      saveSelection();
+      finish();
+      return true;
    }

    return false;
@@ -26,7 +26,6 @@ import android.content.Intent;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.util.SparseIntArray;
@@ -149,16 +148,16 @@ public class ContactSelectionListFragment extends    Fragment

      @Override
      public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) {
-        switch (menuItem.getItemId()) {
-          case R.id.menu_select_all:
-            handleSelectAll();
-            return true;
-          case R.id.menu_view_profile:
-            handleViewProfile();
-            return true;
-          case R.id.menu_delete_selected:
-            handleDeleteSelected();
-            return true;
+        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;
      }
@@ -213,16 +212,9 @@ public class ContactSelectionListFragment extends    Fragment
          ContactSelectionListAdapter adapter = getContactSelectionListAdapter();
          final SparseIntArray actionModeSelection = adapter.getActionModeSelection().clone();
          new Thread(() -> {
-            boolean failed = false;
            for (int index = 0; index < actionModeSelection.size(); index++) {
              int contactId = actionModeSelection.valueAt(index);
-              boolean currentFailed = !dcContext.deleteContact(contactId);
-              failed = currentFailed || failed;
-            }
-            if (failed) {
-              Util.runOnMain(()-> {
-                Toast.makeText(getActivity(), R.string.cannot_delete_contacts_in_use, Toast.LENGTH_LONG).show();
-              });
+              dcContext.deleteContact(contactId);
            }
          }).start();
          adapter.resetActionModeSelection();
@@ -45,6 +45,7 @@ import android.text.TextWatcher;
 import android.util.Log;
 import android.util.Pair;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -53,6 +54,7 @@ import android.view.View.OnFocusChangeListener;
 import android.view.View.OnKeyListener;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
+import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -117,7 +119,7 @@ import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
 import org.thoughtcrime.securesms.util.guava.Optional;
-import org.thoughtcrime.securesms.util.views.Stub;
+import org.thoughtcrime.securesms.util.views.ProgressDialog;
 import org.thoughtcrime.securesms.video.recode.VideoRecoder;
 import org.thoughtcrime.securesms.videochat.VideochatUtil;

@@ -173,11 +175,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
  private   View                        composePanel;
  private   ScaleStableImageView        backgroundView;
  private   MessageRequestsBottomView   messageRequestBottomView;
+  private   ProgressDialog              progressDialog;

  private   AttachmentTypeSelector attachmentTypeSelector;
  private   AttachmentManager      attachmentManager;
  private   AudioRecorder          audioRecorder;
-  private   Stub<MediaKeyboard>    emojiDrawerStub;
+  private   FrameLayout            emojiPickerContainer;
+  private   MediaKeyboard          emojiPicker;
  protected HidingLinearLayout     quickAttachmentToggle;
  private   InputPanel             inputPanel;

@@ -191,6 +195,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
  private boolean    isDefaultSms             = true;
  private boolean    isSecurityInitialized    = false;
  private boolean successfulForwardingAttempt = false;
+  private boolean isEditing = false;

  @Override
  protected void onCreate(Bundle state, boolean ready) {
@@ -317,10 +322,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
    super.onConfigurationChanged(newConfig);
    composeText.setTransport(sendButton.getSelectedTransport());

-    if (emojiDrawerStub.resolved() && container.getCurrentInput() == emojiDrawerStub.get()) {
+    if (emojiPicker != null && container.getCurrentInput() == emojiPicker) {
      container.hideAttachedInput(true);
    }

+    emojiPicker = null; // force reloading next time onEmojiToggle() is called
    initializeBackground();
  }

@@ -358,7 +364,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
            for (int i = 0; i < uriCount; i++) {
              uriList.add(multipleUris.getItemAt(i).getUri());
            }
-            askSendingFiles(uriList, () -> SendRelayedMessageUtil.sendMultipleMsgs(this, chatId, uriList, null));
+            askSendingFiles(uriList, () -> {
+              Util.runOnAnyBackgroundThread(() -> {
+                SendRelayedMessageUtil.sendMultipleMsgs(this, chatId, uriList, null);
+              });
+            });
          }
        }
      }
@@ -486,6 +496,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
      Log.e(TAG, "cannot set up in-chat-search: ", e);
    }

+    if (!dcChat.canSend() || isEditing) {
+      MenuItem attachItem =  menu.findItem(R.id.menu_add_attachment);
+      if (attachItem!=null) {
+        attachItem.setVisible(false);
+      }
+    }
+
    super.onPrepareOptionsMenu(menu);
    return true;
  }
@@ -493,17 +510,40 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
  @Override
  public boolean onOptionsItemSelected(MenuItem item) {
    super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
-      case R.id.menu_leave:                 handleLeaveGroup();                return true;
-      case R.id.menu_archive_chat:          handleArchiveChat();               return true;
-      case R.id.menu_clear_chat:            fragment.handleClearChat();        return true;
-      case R.id.menu_delete_chat:           handleDeleteChat();                return true;
-      case R.id.menu_mute_notifications:    handleMuteNotifications();         return true;
-      case R.id.menu_show_map:              WebxdcActivity.openMaps(this, chatId); return true;
-      case R.id.menu_search_up:             handleMenuSearchNext(false);       return true;
-      case R.id.menu_search_down:           handleMenuSearchNext(true);        return true;
-      case android.R.id.home:               handleReturnToConversationList();  return true;
-      case R.id.menu_ephemeral_messages:    handleEphemeralMessages();         return true;
+    int itemId = item.getItemId();
+    if (itemId == R.id.menu_add_attachment) {
+      handleAddAttachment();
+      return true;
+    } else if (itemId == R.id.menu_leave) {
+      handleLeaveGroup();
+      return true;
+    } else if (itemId == R.id.menu_archive_chat) {
+      handleArchiveChat();
+      return true;
+    } else if (itemId == R.id.menu_clear_chat) {
+      fragment.handleClearChat();
+      return true;
+    } else if (itemId == R.id.menu_delete_chat) {
+      handleDeleteChat();
+      return true;
+    } else if (itemId == R.id.menu_mute_notifications) {
+      handleMuteNotifications();
+      return true;
+    } else if (itemId == R.id.menu_show_map) {
+      WebxdcActivity.openMaps(this, chatId);
+      return true;
+    } else if (itemId == R.id.menu_search_up) {
+      handleMenuSearchNext(false);
+      return true;
+    } else if (itemId == R.id.menu_search_down) {
+      handleMenuSearchNext(true);
+      return true;
+    } else if (itemId == android.R.id.home) {
+      handleReturnToConversationList();
+      return true;
+    } else if (itemId == R.id.menu_ephemeral_messages) {
+      handleEphemeralMessages();
+      return true;
    }

    return false;
@@ -699,6 +739,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   * @return
   */
  private ListenableFuture<Boolean> initializeDraft() {
+    isEditing = false;
    final SettableFuture<Boolean> future = new SettableFuture<>();
    DcMsg draft = dcContext.getDraft(chatId);
    final String sharedText = RelayUtil.getSharedText(this);
@@ -730,8 +771,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
      handleReplyMessage(quote);
    }

-    String filename = draft.getFile();
-    if (filename.isEmpty() || !new File(filename).exists()) {
+    String file = draft.getFile();
+    if (file.isEmpty() || !new File(file).exists()) {
      future.set(!text.isEmpty());
      updateToggleButtonState();
      return future;
@@ -751,26 +792,21 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
      }
    };

-    File file = new File(filename);
-    Uri uri = Uri.fromFile(file);
    switch (draft.getType()) {
      case DcMsg.DC_MSG_IMAGE:
-        setMedia(uri, MediaType.IMAGE).addListener(listener);
+        setMedia(draft, MediaType.IMAGE).addListener(listener);
        break;
      case DcMsg.DC_MSG_GIF:
-        setMedia(uri, MediaType.GIF).addListener(listener);
+        setMedia(draft, MediaType.GIF).addListener(listener);
        break;
      case DcMsg.DC_MSG_AUDIO:
-        setMedia(uri, MediaType.AUDIO).addListener(listener);
+        setMedia(draft, MediaType.AUDIO).addListener(listener);
        break;
      case DcMsg.DC_MSG_VIDEO:
-        setMedia(uri, MediaType.VIDEO).addListener(listener);
-        break;
-      case DcMsg.DC_MSG_WEBXDC:
-        setMedia(draft, MediaType.DOCUMENT).addListener(listener);
+        setMedia(draft, MediaType.VIDEO).addListener(listener);
        break;
      default:
-        setMedia(uri, MediaType.DOCUMENT).addListener(listener);
+        setMedia(draft, MediaType.DOCUMENT).addListener(listener);
        break;
    }

@@ -804,7 +840,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
    sendButton            = ViewUtil.findById(this, R.id.send_button);
    attachButton          = ViewUtil.findById(this, R.id.attach_button);
    composeText           = ViewUtil.findById(this, R.id.embedded_text_editor);
-    emojiDrawerStub       = ViewUtil.findStubById(this, R.id.emoji_drawer_stub);
+    emojiPickerContainer  = ViewUtil.findById(this, R.id.emoji_picker_container);
    composePanel          = ViewUtil.findById(this, R.id.bottom_panel);
    container             = ViewUtil.findById(this, R.id.layout_container);
    quickAttachmentToggle = ViewUtil.findById(this, R.id.quick_attachment_toggle);
@@ -976,14 +1012,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
  protected static final int ACTION_SEND_OUT = 1;
  protected static final int ACTION_SAVE_DRAFT = 2;

-  private String getSelfReaction(int msgId) {
-    try {
-      final String [] selfReactions = rpc.getMsgReactions(dcContext.getAccountId(), msgId).getReactionsByContact().get(DcContact.DC_CONTACT_ID_SELF);
-      if (selfReactions != null && selfReactions.length > 0) return selfReactions[0];
-    } catch(Exception e) { e.printStackTrace(); }
-    return null;
-  }
-
  protected ListenableFuture<Integer> processComposeControls(int action) {
    return processComposeControls(action, composeText.getTextTrimmed(),
      attachmentManager.isAttachmentPresent() ?
@@ -994,9 +1022,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity

    final SettableFuture<Integer> future  = new SettableFuture<>();

-    DcMsg msg = null;
    Optional<QuoteModel> quote = inputPanel.getQuote();
-    Integer recompress = 0;
+    boolean editing = isEditing;

    // for a quick ui feedback, we clear the related controls immediately on sending messages.
    // for drafts, however, we do not change the controls, the activity may be resumed.
@@ -1005,94 +1032,114 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
      inputPanel.clearQuote();
    }

-    if(slideDeck!=null) {
+    Util.runOnAnyBackgroundThread(() -> {
+      DcMsg msg = null;
+      int recompress = 0;

-      if (action==ACTION_SEND_OUT) {
-        attachmentManager.clear(glideRequests, false);
+      if (editing) {
+        int msgId = quote.get().getQuotedMsg().getId();
+        if (action == ACTION_SEND_OUT) {
+          dcContext.sendEditRequest(msgId, body);
+        } else {
+          dcContext.setDraft(chatId, null);
+        }
+        future.set(chatId);
+        return;
      }

-      try {
-        if (slideDeck.getWebxdctDraftId() != 0) {
-          msg = dcContext.getDraft(chatId);
-        } else {
-          List<Attachment> attachments = slideDeck.asAttachments();
-          for (Attachment attachment : attachments) {
-            String contentType = attachment.getContentType();
-            if (MediaUtil.isImageType(contentType) && slideDeck.getDocumentSlide() == null) {
-              msg = new DcMsg(dcContext,
-                MediaUtil.isGif(contentType) ? DcMsg.DC_MSG_GIF : DcMsg.DC_MSG_IMAGE);
-              msg.setDimension(attachment.getWidth(), attachment.getHeight());
-            } else if (MediaUtil.isAudioType(contentType)) {
-              msg = new DcMsg(dcContext,
-                attachment.isVoiceNote() ? DcMsg.DC_MSG_VOICE : DcMsg.DC_MSG_AUDIO);
-            } else if (MediaUtil.isVideoType(contentType) && slideDeck.getDocumentSlide() == null) {
-              msg = new DcMsg(dcContext, DcMsg.DC_MSG_VIDEO);
-              recompress = DcMsg.DC_MSG_VIDEO;
-            } else {
-              msg = new DcMsg(dcContext, DcMsg.DC_MSG_FILE);
+      if(slideDeck!=null) {
+        if (action==ACTION_SEND_OUT) {
+          Util.runOnMain(() -> attachmentManager.clear(glideRequests, false));
+        }
+
+        try {
+          if (slideDeck.getWebxdctDraftId() != 0) {
+            msg = dcContext.getDraft(chatId);
+          } else {
+            List<Attachment> attachments = slideDeck.asAttachments();
+            for (Attachment attachment : attachments) {
+              String contentType = attachment.getContentType();
+              if (MediaUtil.isImageType(contentType) && slideDeck.getDocumentSlide() == null) {
+                msg = new DcMsg(dcContext,
+                                MediaUtil.isGif(contentType) ? DcMsg.DC_MSG_GIF : DcMsg.DC_MSG_IMAGE);
+                msg.setDimension(attachment.getWidth(), attachment.getHeight());
+              } else if (MediaUtil.isAudioType(contentType)) {
+                msg = new DcMsg(dcContext,
+                                attachment.isVoiceNote() ? DcMsg.DC_MSG_VOICE : DcMsg.DC_MSG_AUDIO);
+              } else if (MediaUtil.isVideoType(contentType) && slideDeck.getDocumentSlide() == null) {
+                msg = new DcMsg(dcContext, DcMsg.DC_MSG_VIDEO);
+                recompress = DcMsg.DC_MSG_VIDEO;
+              } else {
+                msg = new DcMsg(dcContext, DcMsg.DC_MSG_FILE);
+              }
+              String path = attachment.getRealPath(this);
+              msg.setFileAndDeduplicate(path, attachment.getFileName(), null);
            }
-            String path = attachment.getRealPath(this);
-            msg.setFile(path, null);
+          }
+          if (msg != null) {
+            msg.setText(body);
          }
        }
+        catch(Exception e) {
+          e.printStackTrace();
+        }
+      }
+      else if (!body.isEmpty()){
+        msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
        msg.setText(body);
      }
-      catch(Exception e) {
-        e.printStackTrace();
+
+      if (quote.isPresent()) {
+        if (msg == null) msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
+        msg.setQuote(quote.get().getQuotedMsg());
      }
-    }
-    else if (!body.isEmpty()){
-      msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
-      msg.setText(body);
-    }

-    if (quote.isPresent()) {
-      if (msg == null) msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
-      msg.setQuote(quote.get().getQuotedMsg());
-    }
+      if (action==ACTION_SEND_OUT) {

-    // msg may still be null to clear drafts
-    new AsyncTask<Object, Void, Void>() {
-      @Override
-      protected Void doInBackground(Object... param) {
-        DcMsg msg = (DcMsg)param[0];
-        Integer recompress = (Integer)param[1];
-        if (action==ACTION_SEND_OUT) {
+        // for WEBXDC, drafts are just sent out as is.
+        // for preparations and other cases, cleanup draft soon.
+        if (msg == null || msg.getType() != DcMsg.DC_MSG_WEBXDC) {
+          dcContext.setDraft(dcChat.getId(), null);
+        }

-          // for WEBXDC, drafts are just sent out as is.
-          // for preparations and other cases, cleanup draft soon.
-          if (msg == null || msg.getType() != DcMsg.DC_MSG_WEBXDC) {
-            dcContext.setDraft(dcChat.getId(), null);
-          }
-
-          if(msg!=null)
-          {
-            boolean doSend = true;
-            if (recompress==DcMsg.DC_MSG_VIDEO) {
-              doSend = VideoRecoder.prepareVideo(ConversationActivity.this, dcChat.getId(), msg);
-            }
-
-            if (doSend) {
-              if (dcContext.sendMsg(dcChat.getId(), msg) == 0) {
-                Util.runOnMain(()-> Toast.makeText(ConversationActivity.this, dcContext.getLastError(), Toast.LENGTH_LONG).show());
-                return null;
+        if(msg!=null) {
+          boolean doSend = true;
+          if (recompress==DcMsg.DC_MSG_VIDEO) {
+            Util.runOnMain(() -> {
+              if (isFinishing()) return;
+              progressDialog = ProgressDialog.show(
+                                                   ConversationActivity.this,
+                                                   "",
+                                                   getString(R.string.one_moment),
+                                                   true,
+                                                   false
+                                                   );
+            });
+            doSend = VideoRecoder.prepareVideo(ConversationActivity.this, dcChat.getId(), msg);
+            Util.runOnMain(() -> {
+              try {
+                if (progressDialog != null) progressDialog.dismiss();
+              } catch (final IllegalArgumentException e) {
+                // The activity is finishing/destroyed, do nothing.
              }
-            }
-
-            Util.runOnMain(()-> sendComplete(dcChat.getId()));
+            });
          }
-        }
-        else {
-          dcContext.setDraft(dcChat.getId(), msg);
-        }
-        return null;
-      }

-      @Override
-      protected void onPostExecute(Void result) {
-        future.set(chatId);
+          if (doSend) {
+            if (dcContext.sendMsg(dcChat.getId(), msg) == 0) {
+              Util.runOnMain(()-> Toast.makeText(ConversationActivity.this, dcContext.getLastError(), Toast.LENGTH_LONG).show());
+              future.set(chatId);
+              return;
+            }
+          }
+
+          Util.runOnMain(() -> sendComplete(dcChat.getId()));
+        }
+      } else {
+        dcContext.setDraft(dcChat.getId(), msg);
      }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, msg, recompress);
+      future.set(chatId);
+    });

    return future;
  }
@@ -1127,7 +1174,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
      return;
    }

-    if (composeText.getText().length() == 0 && !attachmentManager.isAttachmentPresent()) {
+    if (!isEditing && composeText.getText().length() == 0 && !attachmentManager.isAttachmentPresent()) {
      buttonToggle.display(attachButton);
      quickAttachmentToggle.show();
    } else {
@@ -1225,22 +1272,36 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
    });
  }

+  private void reloadEmojiPicker() {
+    emojiPickerContainer.removeAllViews();
+    emojiPicker = (MediaKeyboard) LayoutInflater.from(this).inflate(R.layout.conversation_activity_emojidrawer_stub, emojiPickerContainer, false);
+    emojiPickerContainer.addView(emojiPicker);
+    inputPanel.setMediaKeyboard(emojiPicker);
+  }
+
  @Override
  public void onEmojiToggle() {
-    if (!emojiDrawerStub.resolved()) {
-      inputPanel.setMediaKeyboard(emojiDrawerStub.get());
+    if (emojiPicker == null) {
+      reloadEmojiPicker();
    }

-    if (container.getCurrentInput() == emojiDrawerStub.get()) {
+    if (container.getCurrentInput() == emojiPicker) {
      container.showSoftkey(composeText);
    } else {
-      container.show(composeText, emojiDrawerStub.get());
+      container.show(composeText, emojiPicker);
    }
  }

+  @Override
+  public void onQuoteDismissed() {
+    if (isEditing) composeText.setText("");
+    isEditing = false;
+  }
+
  // media selected by the system keyboard
  @Override
  public void onMediaSelected(@NonNull Uri uri, String contentType) {
+    if (isEditing) return;
    if (MediaUtil.isImageType(contentType)) {
      sendSticker(uri, contentType);
    } else if (MediaUtil.isVideoType(contentType)) {
@@ -1262,7 +1323,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
    if (quote.isPresent()) {
      msg.setQuote(quote.get().getQuotedMsg());
    }
-    msg.setFile(path, null);
+    msg.setFileAndDeduplicate(path, null, null);
+    msg.forceSticker();
    dcContext.sendMsg(chatId, msg);
  }

@@ -1297,8 +1359,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
            Toast.LENGTH_SHORT).show();
      }
      else {
-        processComposeControls(ACTION_SEND_OUT);
-        DcHelper.getNotificationCenter(ConversationActivity.this).maybePlaySendSound(dcChat);
+        processComposeControls(ACTION_SEND_OUT).addListener(new AssertedSuccessListener<Integer>() {
+          @Override
+          public void onSuccess(Integer chatId) {
+            DcHelper.getNotificationCenter(ConversationActivity.this).maybePlaySendSound(dcChat);
+          }
+        });
      }
    }

@@ -1371,6 +1437,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity

  @Override
  public void handleReplyMessage(DcMsg msg) {
+    if (isEditing) composeText.setText("");
+    isEditing = false;
    // If you modify these lines you may also want to modify ConversationItem.setQuote():
    Recipient author = new Recipient(this, dcContext.getContact(msg.getFromId()));

@@ -1386,11 +1454,32 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
            msg.getTimestamp(),
            author,
            text,
-            slideDeck);
+            slideDeck,
+            false);

    inputPanel.clickOnComposeInput();
  }

+  @Override
+  public void handleEditMessage(DcMsg msg) {
+    isEditing = true;
+    Recipient author = new Recipient(this, dcContext.getContact(msg.getFromId()));
+
+    SlideDeck slideDeck = new SlideDeck();
+    String text = msg.getSummarytext(500);
+
+    inputPanel.setQuote(GlideApp.with(this),
+            msg,
+            msg.getTimestamp(),
+            author,
+            text,
+            slideDeck,
+            true);
+
+    setDraftText(msg.getText());
+    inputPanel.clickOnComposeInput();
+  }
+
  @Override
  public void onAttachmentChanged() {
    handleSecurityChange(isSecureText, isDefaultSms);
@@ -16,17 +16,19 @@
 */
 package org.thoughtcrime.securesms;

-import android.content.Context;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
+import static org.thoughtcrime.securesms.ConversationItem.PULSE_HIGHLIGHT_MILLIS;

+import android.content.Context;
 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;
@@ -49,8 +51,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;

-import static org.thoughtcrime.securesms.ConversationItem.PULSE_HIGHLIGHT_MILLIS;
-
 /**
 * A DC adapter for a conversation thread.  Ultimately
 * used by ConversationActivity to display a conversation
@@ -294,7 +294,7 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
    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 && !dcMsg.isSetupMessage()) {
+    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) {
@@ -25,8 +25,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -37,12 +36,10 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
-import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;

 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.view.ActionMode;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -62,8 +59,8 @@ import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.reactions.AddReactionView;
-import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.reactions.ReactionsDetailsFragment;
+import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.AccessibilityUtil;
 import org.thoughtcrime.securesms.util.Debouncer;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
@@ -210,7 +207,7 @@ public class ConversationFragment extends MessageSelectorFragment
    public void onResume() {
        super.onResume();

-        dcContext.marknoticedChat((int) chatId);
+        Util.runOnBackground(() -> dcContext.marknoticedChat((int) chatId));
        if (list.getAdapter() != null) {
            list.getAdapter().notifyDataSetChanged();
        }
@@ -320,12 +317,16 @@ public class ConversationFragment extends MessageSelectorFragment
            return;
        }

+        menu.findItem(R.id.menu_toggle_save).setVisible(false);
+
        if (messageRecords.size() > 1) {
            menu.findItem(R.id.menu_context_details).setVisible(false);
            menu.findItem(R.id.menu_context_share).setVisible(false);
            menu.findItem(R.id.menu_context_reply).setVisible(false);
+            menu.findItem(R.id.menu_context_edit).setVisible(false);
            menu.findItem(R.id.menu_context_reply_privately).setVisible(false);
            menu.findItem(R.id.menu_add_to_home_screen).setVisible(false);
+            //menu.findItem(R.id.menu_toggle_save).setVisible(false);
        } else {
            DcMsg messageRecord = messageRecords.iterator().next();
            DcChat chat = getListAdapter().getChat();
@@ -333,9 +334,19 @@ public class ConversationFragment extends MessageSelectorFragment
            menu.findItem(R.id.menu_context_share).setVisible(messageRecord.hasFile());
            boolean canReply = canReplyToMsg(messageRecord);
            menu.findItem(R.id.menu_context_reply).setVisible(chat.canSend() && canReply);
+            boolean canEdit = canEditMsg(messageRecord);
+            menu.findItem(R.id.menu_context_edit).setVisible(chat.canSend() && canEdit);
            boolean showReplyPrivately = !dcContext.isCommunity() && chat.isMultiUser() && !messageRecord.isOutgoing() && canReply;
            menu.findItem(R.id.menu_context_reply_privately).setVisible(showReplyPrivately);
            menu.findItem(R.id.menu_add_to_home_screen).setVisible(messageRecord.getType() == DcMsg.DC_MSG_WEBXDC);
+
+            /*
+            boolean saved = messageRecord.getSavedMsgId() != 0;
+            MenuItem toggleSave = menu.findItem(R.id.menu_toggle_save);
+            toggleSave.setVisible(messageRecord.canSave() && !chat.isSelfTalk());
+            toggleSave.setIcon(saved? R.drawable.baseline_bookmark_remove_24 : R.drawable.baseline_bookmark_border_24);
+            toggleSave.setTitle(saved? R.string.unsave : R.string.save);
+            */
        }

        // if one of the selected items cannot be saved, disable saving.
@@ -376,6 +387,10 @@ public class ConversationFragment extends MessageSelectorFragment
        return canReply;
    }

+    static boolean canEditMsg(DcMsg dcMsg) {
+        return dcMsg.isOutgoing() && !dcMsg.isInfo() && dcMsg.getType() != DcMsg.DC_MSG_VIDEOCHAT_INVITATION && !dcMsg.hasHtml() && !dcMsg.getText().isEmpty();
+    }
+
    public void handleClearChat() {
        handleDeleteMessages((int) chatId, getListAdapter().getMessageIds());
    }
@@ -476,6 +491,16 @@ public class ConversationFragment extends MessageSelectorFragment
        listener.handleReplyMessage(message);
    }

+    @SuppressLint("RestrictedApi")
+    private void handleEditMessage(final DcMsg message) {
+        if (getActivity() != null) {
+            //noinspection ConstantConditions
+            ((AppCompatActivity) getActivity()).getSupportActionBar().collapseActionView();
+        }
+
+        listener.handleEditMessage(message);
+    }
+
    private void handleReplyMessagePrivately(final DcMsg msg) {

        if (getActivity() != null) {
@@ -493,6 +518,15 @@ public class ConversationFragment extends MessageSelectorFragment
        }
    }

+    private void handleToggleSave(final Set<DcMsg> messageRecords) {
+        DcMsg msg = getSelectedMessageRecord(messageRecords);
+        if (msg.getSavedMsgId() != 0) {
+          dcContext.deleteMsgs(new int[]{msg.getSavedMsgId()});
+        } else {
+          dcContext.saveMsgs(new int[]{msg.getId()});
+        }
+    }
+
    private void reloadList() {
        reloadList(false);
    }
@@ -606,6 +640,7 @@ public class ConversationFragment extends MessageSelectorFragment

    public interface ConversationFragmentListener {
        void handleReplyMessage(DcMsg messageRecord);
+        void handleEditMessage(DcMsg messageRecord);
    }

    private class ConversationScrollListener extends OnScrollListener {
@@ -703,81 +738,7 @@ public class ConversationFragment extends MessageSelectorFragment
                index++;
            }
        }
-        dcContext.markseenMsgs(ids);
-    }
-
-
-    void querySetupCode(final DcMsg dcMsg, String[] preload)
-    {
-        if( !dcMsg.isSetupMessage()) {
-            return;
-        }
-
-        View gl = View.inflate(getActivity(), R.layout.setup_code_grid, null);
-        final EditText[] editTexts = {
-                gl.findViewById(R.id.setupCode0),  gl.findViewById(R.id.setupCode1),  gl.findViewById(R.id.setupCode2),
-                gl.findViewById(R.id.setupCode3),  gl.findViewById(R.id.setupCode4),  gl.findViewById(R.id.setupCode5),
-                gl.findViewById(R.id.setupCode6),  gl.findViewById(R.id.setupCode7),  gl.findViewById(R.id.setupCode8)
-        };
-        AlertDialog.Builder builder1 = new AlertDialog.Builder(getActivity());
-        builder1.setView(gl);
-        editTexts[0].setText(dcMsg.getSetupCodeBegin());
-        editTexts[0].setSelection(editTexts[0].getText().length());
-
-        for( int i = 0; i < 9; i++ ) {
-            if( preload != null && i < preload.length ) {
-                editTexts[i].setText(preload[i]);
-                editTexts[i].setSelection(editTexts[i].getText().length());
-            }
-            editTexts[i].addTextChangedListener(new TextWatcher() {
-                @Override
-                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                }
-
-                @Override
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                    if( s.length()==4 ) {
-                        for ( int i = 0; i < 8; i++ ) {
-                            if( editTexts[i].hasFocus() && editTexts[i+1].getText().length()<4 ) {
-                                editTexts[i+1].requestFocus();
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                @Override
-                public void afterTextChanged(Editable s) {
-                }
-            });
-        }
-
-        builder1.setTitle(getActivity().getString(R.string.autocrypt_continue_transfer_title));
-        builder1.setMessage(getActivity().getString(R.string.autocrypt_continue_transfer_please_enter_code));
-        builder1.setNegativeButton(android.R.string.cancel, null);
-        builder1.setCancelable(false); // prevent the dialog from being dismissed accidentally (when the dialog is closed, the setup code is gone forever and the user has to create a new setup message)
-        builder1.setPositiveButton(android.R.string.ok, (dialog, which) -> {
-            String setup_code = "";
-            final String[] preload1 = new String[9];
-            for ( int i = 0; i < 9; i++ ) {
-                preload1[i] = editTexts[i].getText().toString();
-                setup_code += preload1[i];
-            }
-            boolean success = dcContext.continueKeyTransfer(dcMsg.getId(), setup_code);
-
-            AlertDialog.Builder builder2 = new AlertDialog.Builder(getActivity());
-            builder2.setTitle(getActivity().getString(R.string.autocrypt_continue_transfer_title));
-            builder2.setMessage(getActivity().getString(success? R.string.autocrypt_continue_transfer_succeeded : R.string.autocrypt_bad_setup_code));
-            if( success ) {
-                builder2.setPositiveButton(android.R.string.ok, null);
-            }
-            else {
-                builder2.setNegativeButton(android.R.string.cancel, null);
-                builder2.setPositiveButton(R.string.autocrypt_continue_transfer_retry, (dialog1, which1) -> querySetupCode(dcMsg, preload1));
-            }
-            builder2.show();
-        });
-        builder1.show();
+        Util.runOnAnyBackgroundThread(() -> dcContext.markseenMsgs(ids));
    }

    private class ConversationFragmentItemClickListener implements ItemClickListener {
@@ -799,9 +760,6 @@ public class ConversationFragment extends MessageSelectorFragment
                    actionMode.setTitleOptionalHint(false); // the title represents important information, also indicating implicitly, more items can be selected
                }
            }
-            else if(messageRecord.isSetupMessage()) {
-                querySetupCode(messageRecord,null);
-            }
            else if (messageRecord.getType()==DcMsg.DC_MSG_VIDEOCHAT_INVITATION) {
                new VideochatUtil().join(getActivity(), messageRecord.getId());
            }
@@ -811,6 +769,9 @@ public class ConversationFragment extends MessageSelectorFragment
            else if(messageRecord.getInfoType() == DcMsg.DC_INFO_WEBXDC_INFO_MESSAGE) {
                WebxdcActivity.openWebxdcActivity(getContext(), messageRecord.getParent(), messageRecord.getWebxdcHref());
            }
+            else if (!TextUtils.isEmpty(messageRecord.getPOILocation()) && messageRecord.getType() == DcMsg.DC_MSG_TEXT && !messageRecord.hasHtml()) {
+                WebxdcActivity.openMaps(getContext(), getListAdapter().getChat().getId(), "index.html#"+messageRecord.getPOILocation());
+            }
            else {
                String self_mail = dcContext.getConfig("configured_mail_user");
                if (self_mail != null && !self_mail.isEmpty()
@@ -840,20 +801,18 @@ public class ConversationFragment extends MessageSelectorFragment
            }
        }

-        @Override
-        public void onQuoteClicked(DcMsg messageRecord) {
-            DcMsg quoted = messageRecord.getQuotedMsg();
-            if (quoted == null) {
-                Log.i(TAG, "Clicked on a quote whose original message we never had.");
+        private void jumpToOriginal(DcMsg original) {
+            if (original == null) {
+                Log.i(TAG, "Clicked on a quote or jump-to-original whose original message was deleted/non-existing.");
                Toast.makeText(getContext(), R.string.ConversationFragment_quoted_message_not_found, Toast.LENGTH_SHORT).show();
                return;
            }

-            int foreignChatId = quoted.getChatId();
+            int foreignChatId = original.getChatId();
            if (foreignChatId != 0 && foreignChatId != chatId) {
                Intent intent = new Intent(getActivity(), ConversationActivity.class);
                intent.putExtra(ConversationActivity.CHAT_ID_EXTRA, foreignChatId);
-                int start = DcMsg.getMessagePosition(quoted, dcContext);
+                int start = DcMsg.getMessagePosition(original, dcContext);
                intent.putExtra(ConversationActivity.STARTING_POSITION_EXTRA, start);
                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                ((ConversationActivity) getActivity()).hideSoftKeyboard();
@@ -863,10 +822,20 @@ public class ConversationFragment extends MessageSelectorFragment
                    Log.e(TAG, "Activity was null");
                }
            } else {
-                scrollMaybeSmoothToMsgId(quoted.getId());
+                scrollMaybeSmoothToMsgId(original.getId());
            }
        }

+        @Override
+        public void onJumpToOriginalClicked(DcMsg messageRecord) {
+            jumpToOriginal(dcContext.getMsg(messageRecord.getOriginalMsgId()));
+        }
+
+        @Override
+        public void onQuoteClicked(DcMsg messageRecord) {
+            jumpToOriginal(messageRecord.getQuotedMsg());
+        }
+
      @Override
      public void onShowFullClicked(DcMsg messageRecord) {
        Intent intent = new Intent(getActivity(), FullMsgActivity.class);
@@ -914,6 +883,7 @@ public class ConversationFragment extends MessageSelectorFragment
            statusBarColor = window.getStatusBarColor();
            window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));

+            Util.redMenuItem(menu, R.id.menu_context_delete_message);
            setCorrectMenuVisibility(menu);
            ConversationAdaptiveActionsToolbar.adjustMenuActions(menu, 10, requireActivity().getWindow().getDecorView().getMeasuredWidth());
            return true;
@@ -938,45 +908,52 @@ public class ConversationFragment extends MessageSelectorFragment
        @Override
        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
            hideAddReactionView();
-            switch(item.getItemId()) {
-                case R.id.menu_context_copy:
-                    handleCopyMessage(getListAdapter().getSelectedItems());
-                    actionMode.finish();
-                    return true;
-                case R.id.menu_context_delete_message:
-                    handleDeleteMessages((int) chatId, getListAdapter().getSelectedItems());
-                    return true;
-                case R.id.menu_context_share:
-                    DcHelper.openForViewOrShare(getContext(), getSelectedMessageRecord(getListAdapter().getSelectedItems()).getId(), Intent.ACTION_SEND);
-                    return true;
-                case R.id.menu_context_details:
-                    handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
-                    actionMode.finish();
-                    return true;
-                case R.id.menu_context_forward:
-                    handleForwardMessage(getListAdapter().getSelectedItems());
-                    actionMode.finish();
-                    return true;
-                case R.id.menu_add_to_home_screen:
-                    WebxdcActivity.addToHomeScreen(getActivity(), getSelectedMessageRecord(getListAdapter().getSelectedItems()).getId());
-                    actionMode.finish();
-                    return true;
-                case R.id.menu_context_save_attachment:
-                    handleSaveAttachment(getListAdapter().getSelectedItems());
-                    return true;
-                case R.id.menu_context_reply:
-                    handleReplyMessage(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
-                    actionMode.finish();
-                    return true;
-                case R.id.menu_context_reply_privately:
-                    handleReplyMessagePrivately(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
-                    return true;
-                case R.id.menu_resend:
-                    handleResendMessage(getListAdapter().getSelectedItems());
-                    return true;
-            }
-
-            return false;
+          int itemId = item.getItemId();
+          if (itemId == R.id.menu_context_copy) {
+            handleCopyMessage(getListAdapter().getSelectedItems());
+            actionMode.finish();
+            return true;
+          } else if (itemId == R.id.menu_context_delete_message) {
+            handleDeleteMessages((int) chatId, getListAdapter().getSelectedItems());
+            return true;
+          } else if (itemId == R.id.menu_context_share) {
+            DcHelper.openForViewOrShare(getContext(), getSelectedMessageRecord(getListAdapter().getSelectedItems()).getId(), Intent.ACTION_SEND);
+            return true;
+          } else if (itemId == R.id.menu_context_details) {
+            handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
+            actionMode.finish();
+            return true;
+          } else if (itemId == R.id.menu_context_forward) {
+            handleForwardMessage(getListAdapter().getSelectedItems());
+            actionMode.finish();
+            return true;
+          } else if (itemId == R.id.menu_add_to_home_screen) {
+            WebxdcActivity.addToHomeScreen(getActivity(), getSelectedMessageRecord(getListAdapter().getSelectedItems()).getId());
+            actionMode.finish();
+            return true;
+          } else if (itemId == R.id.menu_context_save_attachment) {
+            handleSaveAttachment(getListAdapter().getSelectedItems());
+            return true;
+          } else if (itemId == R.id.menu_context_reply) {
+            handleReplyMessage(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
+            actionMode.finish();
+            return true;
+          } else if (itemId == R.id.menu_context_edit) {
+            handleEditMessage(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
+            actionMode.finish();
+            return true;
+          } else if (itemId == R.id.menu_context_reply_privately) {
+            handleReplyMessagePrivately(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
+            return true;
+          } else if (itemId == R.id.menu_resend) {
+            handleResendMessage(getListAdapter().getSelectedItems());
+            return true;
+          } else if (itemId == R.id.menu_toggle_save) {
+            handleToggleSave(getListAdapter().getSelectedItems());
+            actionMode.finish();
+            return true;
+          }
+          return false;
        }
    }

@@ -101,6 +101,7 @@ public class ConversationItem extends BaseConversationItem
  protected ViewGroup              bodyBubble;
  protected ReactionsConversationView reactionsView;
  protected View                   replyView;
+  protected View                   jumptoView;
  @Nullable private QuoteView      quoteView;
  private   ConversationItemFooter footer;
  private   TextView               groupSender;
@@ -155,6 +156,7 @@ public class ConversationItem extends BaseConversationItem
    this.quoteView               =            findViewById(R.id.quote_view);
    this.container               =            findViewById(R.id.container);
    this.replyView               =            findViewById(R.id.reply_icon);
+    this.jumptoView              =            findViewById(R.id.jumpto_icon);
    this.msgActionButton         =            findViewById(R.id.msg_action_button);
    this.showFullButton          =            findViewById(R.id.show_full_button);

@@ -176,12 +178,23 @@ public class ConversationItem extends BaseConversationItem
  {
    bind(messageRecord, dcChat, batchSelected, pulseHighlight, recipients);
    this.glideRequests          = glideRequests;
-    this.showSender             = dcContext.isCommunity() || (dcChat.isMultiUser() && !messageRecord.isOutgoing()) || messageRecord.getOverrideSenderName() != null;
+    this.showSender             = dcContext.isCommunity() || ((dcChat.isMultiUser() || dcChat.isSelfTalk()) && !messageRecord.isOutgoing()) || messageRecord.getOverrideSenderName() != null;

    if (showSender) {
      this.dcContact = dcContext.getContact(messageRecord.getFromId());
    }

+    if (dcChat.isSelfTalk() && messageRecord.getOriginalMsgId() != 0) {
+      jumptoView.setVisibility(View.VISIBLE);
+      jumptoView.setOnClickListener(view -> {
+        if (eventListener != null) {
+          eventListener.onJumpToOriginalClicked(messageRecord);
+        }
+      });
+    } else {
+        jumptoView.setVisibility(View.GONE);
+    }
+
    setGutterSizes(messageRecord, showSender);
    setMessageShape(messageRecord);
    setMediaAttributes(messageRecord, showSender);
@@ -378,7 +391,7 @@ public class ConversationItem extends BaseConversationItem
  }

  private boolean hasDocument(DcMsg dcMsg) {
-    return dcMsg.getType()==DcMsg.DC_MSG_FILE && !dcMsg.isSetupMessage();
+    return dcMsg.getType()==DcMsg.DC_MSG_FILE;
  }

  private void setBodyText(DcMsg messageRecord) {
@@ -387,11 +400,7 @@ public class ConversationItem extends BaseConversationItem

    String text = messageRecord.getText();

-    if (messageRecord.isSetupMessage()) {
-      bodyText.setText(context.getString(R.string.autocrypt_asm_click_body));
-      bodyText.setVisibility(View.VISIBLE);
-    }
-    else if (text.isEmpty()) {
+    if (text.isEmpty()) {
      bodyText.setVisibility(View.GONE);
    }
    else {
@@ -707,7 +716,8 @@ public class ConversationItem extends BaseConversationItem
            author,
            quoteTxt,
            slideDeck,
-            current.getType() == DcMsg.DC_MSG_STICKER);
+            current.getType() == DcMsg.DC_MSG_STICKER,
+            false);

    quoteView.setVisibility(View.VISIBLE);
    quoteView.getLayoutParams().width = ViewGroup.LayoutParams.WRAP_CONTENT;
@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Canvas;
-import android.os.Build;
 import android.os.Vibrator;
 import android.view.MotionEvent;
 import android.view.View;
@@ -20,8 +20,8 @@ import static org.thoughtcrime.securesms.ConversationActivity.CHAT_ID_EXTRA;
 import static org.thoughtcrime.securesms.ConversationActivity.STARTING_POSITION_EXTRA;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_ADDRESS;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_ENABLED;
-import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SERVER_FLAGS;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_URL;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SERVER_FLAGS;
 import static org.thoughtcrime.securesms.util.RelayUtil.acquireRelayMessageContent;
 import static org.thoughtcrime.securesms.util.RelayUtil.getDirectSharingChatId;
 import static org.thoughtcrime.securesms.util.RelayUtil.getSharedTitle;
@@ -89,7 +89,6 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
  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";
-  public static final String WARN_CANNOT_ENCRYPT = "warn_cannot_encrypt";

  private ConversationListFragment conversationListFragment;
  public TextView                  title;
@@ -113,7 +112,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
    // 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_1_50_0_android";
+      final String deviceMsgLabel = "update_1_56_0_android";
      if (!dcContext.wasDeviceMsgEverAdded(deviceMsgLabel)) {
        DcMsg msg = null;
        if (!getIntent().getBooleanExtra(FROM_WELCOME, false)) {
@@ -124,7 +123,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
          // Util.copy(inputStream, new FileOutputStream(outputFile));
          // msg.setFile(outputFile, "image/jpeg");

-          msg.setText(getString(R.string.update_1_50_android, "https://raw.githubusercontent.com/ArcaneChat/android/refs/heads/main/CHANGELOG.md"));
+          // full changelog link: "https://lemmy.ml/c/ArcaneChat"
+          msg.setText(getString(R.string.update_1_56_android, "https://arcanechat.me/#contribute"));
        }
        dcContext.addDeviceMsg(deviceMsgLabel, msg);

@@ -257,6 +257,10 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit

  @Override
  protected void onNewIntent(Intent intent) {
+    if (isFinishing()) {
+      Log.w(TAG, "Activity is finishing, aborting onNewIntent()");
+      return;
+    }
    super.onNewIntent(intent);
    setIntent(intent);
    refresh();
@@ -274,11 +278,6 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
      AccountManager.getInstance().switchAccountAndStartActivity(this, accountId);
    }

-    String warnAddr = getIntent().getStringExtra(WARN_CANNOT_ENCRYPT);
-    if (!TextUtils.isEmpty(warnAddr)) {
-      DcHelper.showEncryptionRequiredDialog(this, warnAddr);
-    }
-
    refreshAvatar();
    refreshUnreadIndicator();
    refreshTitle();
@@ -436,34 +435,31 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
  public boolean onOptionsItemSelected(MenuItem item) {
    super.onOptionsItemSelected(item);

-    switch (item.getItemId()) {
-      case R.id.menu_invite_friends:
-        shareInvite();
-        return true;
-      case R.id.menu_settings:
-        startActivity(new Intent(this, ApplicationPreferencesActivity.class));
-        return true;
-      case R.id.menu_qr:
-        new IntentIntegrator(this).setCaptureActivity(QrActivity.class).initiateScan();
-        return true;
-      case R.id.menu_global_map:
-        WebxdcActivity.openMaps(this, 0);
-        return true;
-      case R.id.menu_proxy_settings:
-        startActivity(new Intent(this, ProxySettingsActivity.class));
-        return true;
-      case android.R.id.home:
-        onBackPressed();
-        return true;
-      case R.id.menu_all_media:
-        startActivity(new Intent(this, ProfileActivity.class));
-        return true;
-      case R.id.menu_webxdc_apps_store:
-        handleShowBot("juegos@buzon.uy", "OPENPGP4FPR:d3d403a734be71fe9293a00311fef80dbe5dbc89#a=juegos%40buzon.uy&n=&i=WQZY-8FODS3&s=ZQBkaclFzao");
-        return true;
-      case R.id.menu_public_bots:
-        handleShowBot("puente@buzon.uy", "OPENPGP4FPR:4B41E5AFAF78A0C71DB56138D5BEFED00A45F97A#a=puente%40buzon.uy&n=Public%20Bots&i=ZC_oaJtuvJP&s=5SE96rRovsK");
-        return true;
+    int itemId = item.getItemId();
+    if (itemId == R.id.menu_invite_friends) {
+      shareInvite();
+      return true;
+    } else if (itemId == R.id.menu_settings) {
+      startActivity(new Intent(this, ApplicationPreferencesActivity.class));
+      return true;
+    } else if (itemId == R.id.menu_qr) {
+      new IntentIntegrator(this).setCaptureActivity(QrActivity.class).initiateScan();
+      return true;
+    } else if (itemId == R.id.menu_global_map) {
+      WebxdcActivity.openMaps(this, 0);
+      return true;
+    } else if (itemId == R.id.menu_proxy_settings) {
+      startActivity(new Intent(this, ProxySettingsActivity.class));
+      return true;
+    } else if (itemId == android.R.id.home) {
+      onBackPressed();
+      return true;
+    } else if (itemId == R.id.menu_all_media) {
+      startActivity(new Intent(this, ProfileActivity.class));
+      return true;
+    } else if (itemId == R.id.menu_public_bots) {
+      handleShowBot("botsindex@arcanechat.me", "https://i.delta.chat/#67889B0362BEDBFEE05ACD92C1D737FA632A9582&a=botsindex%40arcanechat.me&n=Public%20Bots&i=336MTEz38EH-RJxM9OKWygYK&s=TpVVGK6C4KrJmRG0bwHLalXt");
+      return true;
    }

    return false;
@@ -1,5 +1,11 @@
 package org.thoughtcrime.securesms;

+import static org.thoughtcrime.securesms.ConversationActivity.CHAT_ID_EXTRA;
+import static org.thoughtcrime.securesms.ConversationActivity.FROM_ARCHIVED_CHATS_EXTRA;
+import static org.thoughtcrime.securesms.util.RelayUtil.acquireRelayMessageContent;
+import static org.thoughtcrime.securesms.util.RelayUtil.isRelayingMessageContent;
+import static org.thoughtcrime.securesms.util.RelayUtil.isSharing;
+
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
@@ -10,12 +16,6 @@ import com.b44t.messenger.DcChat;

 import org.thoughtcrime.securesms.connect.DcHelper;

-import static org.thoughtcrime.securesms.ConversationActivity.CHAT_ID_EXTRA;
-import static org.thoughtcrime.securesms.ConversationActivity.FROM_ARCHIVED_CHATS_EXTRA;
-import static org.thoughtcrime.securesms.util.RelayUtil.acquireRelayMessageContent;
-import static org.thoughtcrime.securesms.util.RelayUtil.isRelayingMessageContent;
-import static org.thoughtcrime.securesms.util.RelayUtil.isSharing;
-
 public class ConversationListArchiveActivity extends PassphraseRequiredActionBarActivity
    implements ConversationListFragment.ConversationSelectedListener
 {
@@ -60,14 +60,13 @@ public class ConversationListArchiveActivity extends PassphraseRequiredActionBar
  public boolean onOptionsItemSelected(MenuItem item) {
    super.onOptionsItemSelected(item);

-    switch (item.getItemId()) {
-      case android.R.id.home:
-        onBackPressed();
-        return true;
-
-      case R.id.mark_as_read:
-        DcHelper.getContext(this).marknoticedChat(DcChat.DC_CHAT_ID_ARCHIVED_LINK);
-        return true;
+    int itemId = item.getItemId();
+    if (itemId == android.R.id.home) {
+      onBackPressed();
+      return true;
+    } else if (itemId == R.id.mark_as_read) {
+      DcHelper.getContext(this).marknoticedChat(DcChat.DC_CHAT_ID_ARCHIVED_LINK);
+      return true;
    }

    return false;
@@ -42,7 +42,6 @@ import com.b44t.messenger.DcMsg;
 import org.thoughtcrime.securesms.ConversationListAdapter.ItemClickListener;
 import org.thoughtcrime.securesms.components.recyclerview.DeleteItemAnimator;
 import org.thoughtcrime.securesms.components.reminder.DozeReminder;
-import org.thoughtcrime.securesms.connect.AccountManager;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.mms.GlideApp;
@@ -81,6 +80,7 @@ public class ConversationListFragment extends BaseConversationListFragment
    DcEventCenter eventCenter = DcHelper.getEventCenter(requireActivity());
    eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_INCOMING_MSG, this);
    eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_MSGS_NOTICED, this);
+    eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_CHAT_DELETED, this);
    eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this);
    eventCenter.addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this);
    eventCenter.addObserver(DcContext.DC_EVENT_MSGS_CHANGED, this);
@@ -322,7 +322,10 @@ public class ConversationListFragment extends BaseConversationListFragment

  @Override
  public void handleEvent(@NonNull DcEvent event) {
-    if (event.getAccountId() != DcHelper.getContext(requireActivity()).getAccountId()) {
+    final int accId = event.getAccountId();
+    if (event.getId() == DcContext.DC_EVENT_CHAT_DELETED) {
+      DcHelper.getNotificationCenter(requireActivity()).removeNotifications(accId, event.getData1Int());
+    } else if (accId != DcHelper.getContext(requireActivity()).getAccountId()) {
      Activity activity = getActivity();
      if (activity instanceof ConversationListActivity) {
        ((ConversationListActivity) activity).refreshUnreadIndicator();
@@ -2,13 +2,12 @@ package org.thoughtcrime.securesms;


 import android.content.Context;
-import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.widget.LinearLayout;

+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.b44t.messenger.DcLot;

 import org.thoughtcrime.securesms.database.model.ThreadRecord;
@@ -4,11 +4,11 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
-import android.util.AttributeSet;

 import com.b44t.messenger.DcChat;
 import com.b44t.messenger.DcMsg;
@@ -1,16 +1,15 @@
 package org.thoughtcrime.securesms;

 import android.content.Context;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;

+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.b44t.messenger.DcChat;
 import com.b44t.messenger.DcContact;
 import com.b44t.messenger.DcContext;
@@ -11,7 +11,6 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -30,7 +29,6 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
 import com.google.android.material.textfield.TextInputLayout;
-import com.soundcloud.android.crop.Crop;

 import org.thoughtcrime.securesms.components.AvatarSelector;
 import org.thoughtcrime.securesms.components.InputAwareLayout;
@@ -102,13 +100,12 @@ public class CreateProfileActivity extends BaseActionBarActivity {
  @Override
  public boolean onOptionsItemSelected(MenuItem item) {
    super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
-      case android.R.id.home:
-        onBackPressed();
-        return true;
-      case R.id.menu_create_profile:
-        updateProfile();
-        break;
+    int itemId = item.getItemId();
+    if (itemId == android.R.id.home) {
+      onBackPressed();
+      return true;
+    } else if (itemId == R.id.menu_create_profile) {
+      updateProfile();
    }

    return false;
@@ -147,10 +144,6 @@ public class CreateProfileActivity extends BaseActionBarActivity {
      case ScribbleActivity.SCRIBBLE_REQUEST_CODE:
        setAvatarView(data.getData());
        break;
-
-      case Crop.REQUEST_CROP:
-        setAvatarView(Crop.getOutput(data));
-        break;
    }
  }

@@ -105,17 +105,16 @@ public class FullMsgActivity extends WebViewActivity

  @Override
  public boolean onContextItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case R.id.action_export_image:
-        // TODO: extract image from "data:" link or download URL
-        return true;
-      case R.id.action_copy_link:
-        Util.writeTextToClipboard(this, imageUrl);
-        Toast.makeText(this, getString(R.string.copied_to_clipboard), Toast.LENGTH_SHORT).show();
-        return true;
-      default:
-        return super.onContextItemSelected(item);
+    int itemId = item.getItemId();
+    if (itemId == R.id.action_export_image) {
+      // TODO: extract image from "data:" link or download URL
+      return true;
+    } else if (itemId == R.id.action_copy_link) {
+      Util.writeTextToClipboard(this, imageUrl);
+      Toast.makeText(this, getString(R.string.copied_to_clipboard), Toast.LENGTH_SHORT).show();
+      return true;
    }
+    return super.onContextItemSelected(item);
  }

  private static void loadHtmlAsync(final WeakReference<FullMsgActivity> activityReference) {
@@ -157,40 +156,39 @@ public class FullMsgActivity extends WebViewActivity
  @Override
  public boolean onOptionsItemSelected(MenuItem item) {
    super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
-      case R.id.load_remote_content:
-        AlertDialog.Builder builder = new AlertDialog.Builder(this)
-          .setTitle(R.string.load_remote_content)
-          .setMessage(R.string.load_remote_content_ask);
+    if (item.getItemId() == R.id.load_remote_content) {
+      AlertDialog.Builder builder = new AlertDialog.Builder(this)
+        .setTitle(R.string.load_remote_content)
+        .setMessage(R.string.load_remote_content_ask);

-        // we are using the buttons "[Always]  [Never][Once]" in that order.
-        // 1. Checkmarks before [Always] and [Never] show the current state.
-        // 2. [Once] is also shown in always-mode and disables always-mode if selected
-        //    (there was the idea to hide [Once] in always mode, but that looks more like a bug in the end)
-        // (maybe a usual Always-Checkbox and "[Cancel][OK]" buttons are an alternative, however, a [Once]
-        // would be required as well - probably as the leftmost button which is not that usable in
-        // not-always-mode where the dialog is used more often. Or [Ok] would mean "Once" as well as "Change checkbox setting",
-        // which is also a bit weird. Anyway, let's give the three buttons a try :)
-        final String checkmark = DynamicTheme.getCheckmarkEmoji(this) + " ";
-        String alwaysCheckmark = "";
-        String onceCheckmark = "";
-        String neverCheckmark = "";
-        if (!blockLoadingRemote && Prefs.getAlwaysLoadRemoteContent(this)) {
-          alwaysCheckmark = checkmark;
-        } else if (loadRemoteContent) {
-          onceCheckmark = checkmark;
-        } else {
-          neverCheckmark = checkmark;
-        }
+      // we are using the buttons "[Always]  [Never][Once]" in that order.
+      // 1. Checkmarks before [Always] and [Never] show the current state.
+      // 2. [Once] is also shown in always-mode and disables always-mode if selected
+      //    (there was the idea to hide [Once] in always mode, but that looks more like a bug in the end)
+      // (maybe a usual Always-Checkbox and "[Cancel][OK]" buttons are an alternative, however, a [Once]
+      // would be required as well - probably as the leftmost button which is not that usable in
+      // not-always-mode where the dialog is used more often. Or [Ok] would mean "Once" as well as "Change checkbox setting",
+      // which is also a bit weird. Anyway, let's give the three buttons a try :)
+      final String checkmark = DynamicTheme.getCheckmarkEmoji(this) + " ";
+      String alwaysCheckmark = "";
+      String onceCheckmark = "";
+      String neverCheckmark = "";
+      if (!blockLoadingRemote && Prefs.getAlwaysLoadRemoteContent(this)) {
+        alwaysCheckmark = checkmark;
+      } else if (loadRemoteContent) {
+        onceCheckmark = checkmark;
+      } else {
+        neverCheckmark = checkmark;
+      }

-        if (!blockLoadingRemote) {
-          builder.setNeutralButton(alwaysCheckmark + getString(R.string.always), (dialog, which) -> onChangeLoadRemoteContent(LoadRemoteContent.ALWAYS));
-        }
-        builder.setNegativeButton(neverCheckmark + getString(blockLoadingRemote ? R.string.no : R.string.never), (dialog, which) -> onChangeLoadRemoteContent(LoadRemoteContent.NEVER));
-        builder.setPositiveButton(onceCheckmark + getString(R.string.once), (dialog, which) -> onChangeLoadRemoteContent(LoadRemoteContent.ONCE));
+      if (!blockLoadingRemote) {
+        builder.setNeutralButton(alwaysCheckmark + getString(R.string.always), (dialog, which) -> onChangeLoadRemoteContent(LoadRemoteContent.ALWAYS));
+      }
+      builder.setNegativeButton(neverCheckmark + getString(blockLoadingRemote ? R.string.no : R.string.never), (dialog, which) -> onChangeLoadRemoteContent(LoadRemoteContent.NEVER));
+      builder.setPositiveButton(onceCheckmark + getString(R.string.once), (dialog, which) -> onChangeLoadRemoteContent(LoadRemoteContent.ONCE));

-        builder.show();
-        return true;
+      builder.show();
+      return true;
    }
    return false;
  }
@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms;
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
@@ -17,16 +18,14 @@ import android.widget.Toast;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
 import androidx.loader.app.LoaderManager;

 import com.b44t.messenger.DcChat;
 import com.b44t.messenger.DcContact;
 import com.b44t.messenger.DcContext;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.request.target.SimpleTarget;
+import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
-import com.soundcloud.android.crop.Crop;

 import org.thoughtcrime.securesms.components.AvatarSelector;
 import org.thoughtcrime.securesms.connect.DcHelper;
@@ -76,7 +75,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
    setContentView(R.layout.group_create_activity);
    verified = false;
    broadcast = getIntent().getBooleanExtra(CREATE_BROADCAST, false);
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
    getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);

    groupChatId = getIntent().getIntExtra(EDIT_GROUP_CHAT_ID, 0);
@@ -209,37 +208,22 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
  @Override
  public boolean onOptionsItemSelected(@NonNull MenuItem item) {
    super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
-      case android.R.id.home:
-        finish();
-        return true;
-      case R.id.menu_create_group:
-        String groupName = getGroupName();
-        if (showGroupNameEmptyToast(groupName)) return true;
+    int itemId = item.getItemId();
+    if (itemId == android.R.id.home) {
+      finish();
+      return true;
+    } else if (itemId == R.id.menu_create_group) {
+      String groupName = getGroupName();
+      if (showGroupNameEmptyToast(groupName)) return true;

-        if (groupChatId!=0) {
-          updateGroup(groupName);
-        } else {
-          verified = !broadcast && allMembersVerified();
-          if (verified && getAdapter().getContacts().size() == 1) {
-            new AlertDialog.Builder(this)
-              .setMessage(R.string.create_verified_group_ask)
-              .setNeutralButton(R.string.learn_more, (d, w) -> DcHelper.openHelp(this, "#e2eeguarantee"))
-              .setPositiveButton(R.string.yes, (d, w) -> {
-                  createGroup(groupName);
-              })
-              .setNegativeButton(R.string.no, (d, w) -> {
-                  verified = false;
-                  createGroup(groupName);
-              })
-              .setCancelable(true)
-              .show();
-          } else {
-            createGroup(groupName);
-          }
-        }
+      if (groupChatId != 0) {
+        updateGroup(groupName);
+      } else {
+        verified = !broadcast && allMembersVerified();
+        createGroup(groupName);
+      }

-        return true;
+      return true;
    }

    return false;
@@ -360,10 +344,6 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
      case ScribbleActivity.SCRIBBLE_REQUEST_CODE:
        setAvatarView(data.getData());
        break;
-
-      case Crop.REQUEST_CROP:
-        setAvatarView(Crop.getOutput(data));
-        break;
    }
  }

@@ -375,11 +355,14 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
            .diskCacheStrategy(DiskCacheStrategy.NONE)
            .centerCrop()
            .override(AVATAR_SIZE, AVATAR_SIZE)
-            .into(new SimpleTarget<Bitmap>() {
+            .into(new CustomTarget<Bitmap>() {
              @Override
              public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
                setAvatar(output, resource);
              }
+
+              @Override
+              public void onLoadCleared(@Nullable Drawable placeholder) {}
            });
  }

@@ -4,7 +4,6 @@ import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_ENABLED;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_URL;

 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -16,7 +15,6 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.text.util.Linkify;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -41,7 +39,6 @@ import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
-import com.soundcloud.android.crop.Crop;

 import org.thoughtcrime.securesms.components.AvatarSelector;
 import org.thoughtcrime.securesms.connect.AccountManager;
@@ -56,6 +53,7 @@ import org.thoughtcrime.securesms.profiles.ProfileMediaConstraints;
 import org.thoughtcrime.securesms.proxy.ProxySettingsActivity;
 import org.thoughtcrime.securesms.qr.RegistrationQrActivity;
 import org.thoughtcrime.securesms.scribbles.ScribbleActivity;
+import org.thoughtcrime.securesms.util.IntentUtils;
 import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.views.ProgressDialog;
@@ -71,7 +69,7 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
  private static final String DCACCOUNT = "dcaccount";
  private static final String DCLOGIN = "dclogin";
  private static final String INSTANCES_URL = "https://delta.chat/chatmail";
-  private static final String DEFAULT_CHATMAIL_HOST = "nine.testrun.org";
+  private static final String DEFAULT_CHATMAIL_HOST = "arcanechat.me";

  public static final String QR_ACCOUNT_EXTRA = "qr_account_extra";
  public static final String FROM_WELCOME = "from_welcome";
@@ -158,14 +156,14 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
  public boolean onOptionsItemSelected(@NonNull MenuItem item) {
    super.onOptionsItemSelected(item);

-    switch (item.getItemId()) {
-    case android.R.id.home:
+    int itemId = item.getItemId();
+    if (itemId == android.R.id.home) {
      getOnBackPressedDispatcher().onBackPressed();
      return true;
-    case R.id.menu_proxy_settings:
+    } else if (itemId == R.id.menu_proxy_settings) {
      startActivity(new Intent(this, ProxySettingsActivity.class));
      return true;
-    case R.id.menu_view_log:
+    } else if (itemId == R.id.menu_view_log) {
      startActivity(new Intent(this, LogViewActivity.class));
      return true;
    }
@@ -191,10 +189,6 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
        setAvatarView(data.getData());
        break;

-      case Crop.REQUEST_CROP:
-        setAvatarView(Crop.getOutput(data));
-        break;
-
      case IntentIntegrator.REQUEST_CODE:
        String qrRaw = data.getStringExtra(RegistrationQrActivity.QRDATA_EXTRA);
        if (qrRaw == null) {
@@ -333,14 +327,14 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements

    privacyPolicyBtn.setOnClickListener(view -> {
      if (!isDcLogin) {
-        WebViewActivity.openUrlInBrowser(this, "https://" + providerHost + "/privacy.html");
+        IntentUtils.showInBrowser(this, "https://" + providerHost + "/privacy.html");
      }
    });

    signUpBtn.setOnClickListener(view -> createProfile());

    findViewById(R.id.use_other_server).setOnClickListener((v) -> {
-      WebViewActivity.openUrlInBrowser(this, INSTANCES_URL);
+      IntentUtils.showInBrowser(this, INSTANCES_URL);
    });
    findViewById(R.id.login_button).setOnClickListener((v) -> {
      startRegistrationActivity();
@@ -57,22 +57,22 @@ public class LocalHelpActivity extends WebViewActivity
  @Override
  public boolean onOptionsItemSelected(MenuItem item) {
    super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
-      case R.id.log_scroll_up:
-        webView.scrollTo(0, 0);
-        return true;
-      case R.id.learn_more:
-        openOnlineUrl("https://delta.chat");
-        return true;
-      case R.id.privacy_policy:
-        openOnlineUrl("https://delta.chat/gdpr");
-        return true;
-      case R.id.contribute:
-        openOnlineUrl("https://github.com/deltachat/deltachat-android");
-        return true;
-      case R.id.report_issue:
-        openOnlineUrl("https://github.com/deltachat/deltachat-android/issues");
-        return true;
+    int itemId = item.getItemId();
+    if (itemId == R.id.log_scroll_up) {
+      webView.scrollTo(0, 0);
+      return true;
+    } else if (itemId == R.id.learn_more) {
+      openOnlineUrl("https://arcanechat.me");
+      return true;
+    } else if (itemId == R.id.privacy_policy) {
+      openOnlineUrl("https://arcanechat.me/privacy.html");
+      return true;
+    } else if (itemId == R.id.contribute) {
+      openOnlineUrl("https://arcanechat.me/#contribute");
+      return true;
+    } else if (itemId == R.id.report_issue) {
+      openOnlineUrl("https://github.com/ArcaneChat/android/issues");
+      return true;
    }
    return false;
  }
@@ -54,42 +54,42 @@ public class LogViewActivity extends BaseActionBarActivity {
    super.onOptionsItemSelected(item);
    Float newSize;

-    switch (item.getItemId()) {
-      case android.R.id.home:
-        finish();
-        return true;
-      case R.id.save_log:
-        Permissions.with(this)
-            .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-            .alwaysGrantOnSdk30()
-            .ifNecessary()
-            .onAllGranted(() -> {
-              File outputDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
-              boolean success = logViewFragment.saveLogFile(outputDir) != null;
-              new AlertDialog.Builder(this)
-                  .setMessage(success? R.string.pref_saved_log : R.string.pref_save_log_failed)
-                  .setPositiveButton(android.R.string.ok, null)
-                  .show();
-            })
-            .execute();
-        return true;
-      case R.id.share_log:
-        shareLog();
-        return true;
-      case R.id.log_zoom_in:
-        newSize = logViewFragment.getLogTextSize() + 2.0f;
-        logViewFragment.setLogTextSize(newSize);
-        return false;
-      case R.id.log_zoom_out:
-        newSize = logViewFragment.getLogTextSize() - 2.0f;
-        logViewFragment.setLogTextSize(newSize);
-        return false;
-      case R.id.log_scroll_down:
-        logViewFragment.scrollDownLog();
-        return false;
-      case R.id.log_scroll_up:
-        logViewFragment.scrollUpLog();
-        return false;
+    int itemId = item.getItemId();
+    if (itemId == android.R.id.home) {
+      finish();
+      return true;
+    } else if (itemId == R.id.save_log) {
+      Permissions.with(this)
+        .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+        .alwaysGrantOnSdk30()
+        .ifNecessary()
+        .onAllGranted(() -> {
+          File outputDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+          boolean success = logViewFragment.saveLogFile(outputDir) != null;
+          new AlertDialog.Builder(this)
+            .setMessage(success ? R.string.pref_saved_log : R.string.pref_save_log_failed)
+            .setPositiveButton(android.R.string.ok, null)
+            .show();
+        })
+        .execute();
+      return true;
+    } else if (itemId == R.id.share_log) {
+      shareLog();
+      return true;
+    } else if (itemId == R.id.log_zoom_in) {
+      newSize = logViewFragment.getLogTextSize() + 2.0f;
+      logViewFragment.setLogTextSize(newSize);
+      return false;
+    } else if (itemId == R.id.log_zoom_out) {
+      newSize = logViewFragment.getLogTextSize() - 2.0f;
+      logViewFragment.setLogTextSize(newSize);
+      return false;
+    } else if (itemId == R.id.log_scroll_down) {
+      logViewFragment.scrollDownLog();
+      return false;
+    } else if (itemId == R.id.log_scroll_up) {
+      logViewFragment.scrollUpLog();
+      return false;
    }

    return false;
@@ -18,14 +18,12 @@
 package org.thoughtcrime.securesms;

 import android.Manifest;
-import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.text.TextUtils;
@@ -16,9 +16,9 @@
 */
 package org.thoughtcrime.securesms;

-import android.app.Activity;
 import android.Manifest;
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -207,7 +207,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
      messageRecord = null;
      long date = getIntent().getLongExtra(DATE_EXTRA, 0);
      long size = getIntent().getLongExtra(SIZE_EXTRA, 0);
-      initialMedia = new MediaItem(null, getIntent().getData(), getIntent().getType(),
+      initialMedia = new MediaItem(null, getIntent().getData(), null, getIntent().getType(),
          DcMsg.DC_MSG_NO_ID, date, size, false);

      if (address != null) {
@@ -218,7 +218,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
    } else {
      messageRecord = dcContext.getMsg(msgId);
      initialMedia = new MediaItem(Recipient.fromChat(context, msgId), Uri.fromFile(messageRecord.getFileAsFile()),
-          messageRecord.getFilemime(), messageRecord.getId(), messageRecord.getDateReceived(),
+          messageRecord.getFilename(), messageRecord.getFilemime(), messageRecord.getId(), messageRecord.getDateReceived(),
          messageRecord.getFilebytes(), messageRecord.isOutgoing());
      conversationRecipient = Recipient.fromChat(context, msgId);
    }
@@ -232,12 +232,11 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
    // if you search for the place where the media are loaded, go to 'onCreateLoader'.

    Log.w(TAG, "Loading Part URI: " + initialMedia);
-
    if (messageRecord != null) {
      getSupportLoaderManager().restartLoader(0, null, this);
    } else {
      mediaPager.setAdapter(new SingleItemPagerAdapter(this, GlideApp.with(this),
-          getWindow(), initialMedia.uri, initialMedia.type, initialMedia.size));
+          getWindow(), initialMedia.uri, initialMedia.name, initialMedia.type, initialMedia.size));
    }
  }

@@ -313,7 +312,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
  private void performSavetoDisk(@NonNull MediaItem mediaItem) {
    SaveAttachmentTask saveTask = new SaveAttachmentTask(MediaPreviewActivity.this);
    long               saveDate = (mediaItem.date > 0) ? mediaItem.date : System.currentTimeMillis();
-    saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Attachment(mediaItem.uri, mediaItem.type, saveDate, null));
+    saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Attachment(mediaItem.uri, mediaItem.type, saveDate, mediaItem.name));
  }

  private void showInChat() {
@@ -346,27 +345,32 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
    DcChat dcChat = dcContext.getChat(dcMsg.getChatId());

    String text = getResources().getQuantityString(
-      dcChat.isDeviceTalk()? R.plurals.ask_delete_messages_simple : R.plurals.ask_delete_messages,
+      dcChat.isDeviceTalk() ? R.plurals.ask_delete_messages_simple : R.plurals.ask_delete_messages,
      1, 1);
+    int positiveBtnLabel = dcChat.isSelfTalk() ? R.string.delete : R.string.delete_for_me;
+    final int[] messageIds = new int[]{mediaItem.msgId};

    AlertDialog.Builder builder = new AlertDialog.Builder(this);
    builder.setMessage(text);
    builder.setCancelable(true);
-
-    builder.setPositiveButton(R.string.delete, (dialogInterface, which) -> {
-      new AsyncTask<Void, Void, Void>() {
-        @Override
-        protected Void doInBackground(Void... voids) {
-          dcContext.deleteMsgs(new int[]{mediaItem.msgId});
-          return null;
-        }
-      }.execute();
-
+    builder.setNeutralButton(android.R.string.cancel, null);
+    builder.setPositiveButton(positiveBtnLabel, (dialogInterface, which) -> {
+      Util.runOnAnyBackgroundThread(() -> dcContext.deleteMsgs(messageIds));
      finish();
    });
-    builder.setNegativeButton(android.R.string.cancel, null);
-    AlertDialog dialog = builder.show();
-    Util.redPositiveButton(dialog);
+
+    if(dcChat.canSend() && !dcChat.isSelfTalk() && dcMsg.isOutgoing()) {
+      builder.setNegativeButton(R.string.delete_for_everyone, (d, which) -> {
+        Util.runOnAnyBackgroundThread(() -> dcContext.sendDeleteRequest(messageIds));
+        finish();
+      });
+      AlertDialog dialog = builder.show();
+      Util.redButton(dialog, AlertDialog.BUTTON_NEGATIVE);
+      Util.redPositiveButton(dialog);
+    } else {
+      AlertDialog dialog = builder.show();
+      Util.redPositiveButton(dialog);
+    }
  }

  @Override
@@ -396,14 +400,28 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
  public boolean onOptionsItemSelected(MenuItem item) {
    super.onOptionsItemSelected(item);

-    switch (item.getItemId()) {
-      case R.id.media_preview__edit:     editAvatar();   return true;
-      case R.id.media_preview__overview: showOverview(); return true;
-      case R.id.media_preview__share:    share();        return true;
-      case R.id.save:                    saveToDisk();   return true;
-      case R.id.delete:                  deleteMedia();  return true;
-      case R.id.show_in_chat:            showInChat();   return true;
-      case android.R.id.home:            finish();       return true;
+    int itemId = item.getItemId();
+    if (itemId == R.id.media_preview__edit) {
+      editAvatar();
+      return true;
+    } else if (itemId == R.id.media_preview__overview) {
+      showOverview();
+      return true;
+    } else if (itemId == R.id.media_preview__share) {
+      share();
+      return true;
+    } else if (itemId == R.id.save) {
+      saveToDisk();
+      return true;
+    } else if (itemId == R.id.delete) {
+      deleteMedia();
+      return true;
+    } else if (itemId == R.id.show_in_chat) {
+      showInChat();
+      return true;
+    } else if (itemId == android.R.id.home) {
+      finish();
+      return true;
    }

    return false;
@@ -473,9 +491,12 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
      MediaItemAdapter adapter = (MediaItemAdapter)mediaPager.getAdapter();

      if (adapter != null) {
-        MediaItem item = adapter.getMediaItemFor(position);
-        if (item.recipient != null) item.recipient.removeListener(MediaPreviewActivity.this);
-
+        try {
+          MediaItem item = adapter.getMediaItemFor(position);
+          if (item.recipient != null) item.recipient.removeListener(MediaPreviewActivity.this);
+        } catch (IllegalArgumentException e) {
+          Log.w(TAG, "Ignoring invalid position index");
+        }
        adapter.pause(position);
      }
    }
@@ -486,18 +507,20 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
    private final GlideRequests glideRequests;
    private final Window        window;
    private final Uri           uri;
+    private final String        name;
    private final String        mediaType;
    private final long          size;

    private final LayoutInflater inflater;

    SingleItemPagerAdapter(@NonNull Context context, @NonNull GlideRequests glideRequests,
-                           @NonNull Window window, @NonNull Uri uri, @NonNull String mediaType,
+                           @NonNull Window window, @NonNull Uri uri, @Nullable String name, @NonNull String mediaType,
                           long size)
    {
      this.glideRequests = glideRequests;
      this.window        = window;
      this.uri           = uri;
+      this.name          = name;
      this.mediaType     = mediaType;
      this.size          = size;
      this.inflater      = LayoutInflater.from(context);
@@ -519,7 +542,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
      MediaView mediaView = itemView.findViewById(R.id.media_view);

      try {
-        mediaView.set(glideRequests, window, uri, mediaType, size, true);
+        mediaView.set(glideRequests, window, uri, name, mediaType, size, true);
      } catch (IOException e) {
        Log.w(TAG, e);
      }
@@ -539,7 +562,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity

    @Override
    public MediaItem getMediaItemFor(int position) {
-      return new MediaItem(null, uri, mediaType, DcMsg.DC_MSG_NO_ID, -1, -1, true);
+      return new MediaItem(null, uri, name, mediaType, DcMsg.DC_MSG_NO_ID, -1, -1, true);
    }

    @Override
@@ -604,7 +627,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity

      try {
        //noinspection ConstantConditions
-        mediaView.set(glideRequests, window, Uri.fromFile(msg.getFileAsFile()),
+        mediaView.set(glideRequests, window, Uri.fromFile(msg.getFileAsFile()), msg.getFilename(),
            msg.getFilemime(), msg.getFilebytes(), autoplay);
      } catch (IOException e) {
        Log.w(TAG, e);
@@ -633,6 +656,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity

      return new MediaItem(Recipient.fromChat(context, msg.getId()),
                           Uri.fromFile(msg.getFileAsFile()),
+                           msg.getFilename(),
                           msg.getFilemime(),
                           msg.getId(),
                           msg.getDateReceived(),
@@ -655,6 +679,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
  private static class MediaItem {
    private final @Nullable Recipient          recipient;
    private final @NonNull  Uri                uri;
+    private final @Nullable String             name;
    private final @NonNull  String             type;
    private final           int                msgId;
    private final           long               date;
@@ -663,6 +688,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity

    private MediaItem(@Nullable Recipient recipient,
                      @NonNull Uri uri,
+                      @Nullable String name,
                      @NonNull String type,
                      int msgId,
                      long date,
@@ -671,6 +697,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
    {
      this.recipient  = recipient;
      this.uri        = uri;
+      this.name       = name;
      this.type       = type;
      this.msgId      = msgId;
      this.date       = date;
@@ -61,22 +61,46 @@ public abstract class MessageSelectorFragment
  }

  protected void handleDeleteMessages(int chatId, final int[] messageIds) {
-    DcChat dcChat = DcHelper.getContext(getActivity()).getChat(chatId);
+    DcChat dcChat = dcContext.getChat(chatId);
+    boolean canDeleteForAll = true;
+    if (dcChat.canSend() && !dcChat.isSelfTalk()) {
+      for(int msgId : messageIds) {
+        DcMsg msg = dcContext.getMsg(msgId);
+        if (!msg.isOutgoing() || msg.isInfo()) {
+          canDeleteForAll = false;
+          break;
+        }
+      }
+    } else {
+      canDeleteForAll = false;
+    }

    String text = getActivity().getResources().getQuantityString(
-      dcChat.isDeviceTalk()? R.plurals.ask_delete_messages_simple : R.plurals.ask_delete_messages,
+      dcChat.isDeviceTalk() ? R.plurals.ask_delete_messages_simple : R.plurals.ask_delete_messages,
      messageIds.length, messageIds.length);
+    int positiveBtnLabel = dcChat.isSelfTalk() ? R.string.delete : R.string.delete_for_me;

-    AlertDialog dialog = new AlertDialog.Builder(getActivity())
-            .setMessage(text)
-            .setCancelable(true)
-            .setPositiveButton(R.string.delete, (d, which) -> {
-                dcContext.deleteMsgs(messageIds);
-                if (actionMode != null) actionMode.finish();
-            })
-            .setNegativeButton(android.R.string.cancel, null)
-            .show();
-    Util.redPositiveButton(dialog);
+    AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity())
+      .setMessage(text)
+      .setCancelable(true)
+      .setNeutralButton(android.R.string.cancel, null)
+      .setPositiveButton(positiveBtnLabel, (d, which) -> {
+        dcContext.deleteMsgs(messageIds);
+        if (actionMode != null) actionMode.finish();
+      });
+
+    if(canDeleteForAll) {
+      builder.setNegativeButton(R.string.delete_for_everyone, (d, which) -> {
+        dcContext.sendDeleteRequest(messageIds);
+        if (actionMode != null) actionMode.finish();
+      });
+      AlertDialog dialog = builder.show();
+      Util.redButton(dialog, AlertDialog.BUTTON_NEGATIVE);
+      Util.redPositiveButton(dialog);
+    } else {
+      AlertDialog dialog = builder.show();
+      Util.redPositiveButton(dialog);
+    }
  }

  protected void handleSaveAttachment(final Set<DcMsg> messageRecords) {
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms;

 import android.content.Context;
+
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;

@@ -18,7 +19,7 @@ public class MuteDialog {
      // See https://c.delta.chat/classdc__context__t.html#a6460395925d49d2053bc95224bf5ce37.
      switch (which) {
        case 0:  muteUntil = TimeUnit.HOURS.toSeconds(1); break;
-        case 1:  muteUntil = TimeUnit.HOURS.toSeconds(2); break;
+        case 1:  muteUntil = TimeUnit.HOURS.toSeconds(8); break;
        case 2:  muteUntil = TimeUnit.DAYS.toSeconds(1);  break;
        case 3:  muteUntil = TimeUnit.DAYS.toSeconds(7);  break;
        case 4:  muteUntil = -1; break; // mute forever
@@ -16,12 +16,15 @@
 */
 package org.thoughtcrime.securesms;

+import static org.thoughtcrime.securesms.ConversationActivity.CHAT_ID_EXTRA;
+import static org.thoughtcrime.securesms.ConversationActivity.TEXT_EXTRA;
+import static org.thoughtcrime.securesms.util.RelayUtil.acquireRelayMessageContent;
+import static org.thoughtcrime.securesms.util.RelayUtil.isRelayingMessageContent;
+
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.Menu;
-import android.view.View;
 import android.widget.Toast;

 import androidx.appcompat.app.AlertDialog;
@@ -36,11 +39,6 @@ import org.thoughtcrime.securesms.qr.QrActivity;
 import org.thoughtcrime.securesms.qr.QrCodeHandler;
 import org.thoughtcrime.securesms.util.MailtoUtil;

-import static org.thoughtcrime.securesms.ConversationActivity.CHAT_ID_EXTRA;
-import static org.thoughtcrime.securesms.ConversationActivity.TEXT_EXTRA;
-import static org.thoughtcrime.securesms.util.RelayUtil.acquireRelayMessageContent;
-import static org.thoughtcrime.securesms.util.RelayUtil.isRelayingMessageContent;
-
 /**
 * Activity container for starting a new conversation.
 *
@@ -111,8 +109,6 @@ public class NewConversationActivity extends ContactSelectionActivity {
      int contactId = dcContext.lookupContactIdByAddr(addr);
      if (contactId!=0 && dcContext.getChatIdByContactId(contactId)!=0) {
        openConversation(dcContext.getChatIdByContactId(contactId));
-      } else if (contactId == 0 && dcContext.isChatmail()) {
-        DcHelper.showEncryptionRequiredDialog(this, addr);
      } else {
        String nameNAddr = contactId == 0 ? addr : dcContext.getContact(contactId).getNameNAddr();
        new AlertDialog.Builder(this)
@@ -153,6 +153,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
          menu.findItem(R.id.share).setVisible(false);
        }
      } else {
+        menu.findItem(R.id.menu_clone).setVisible(false);
        canReceive = false;
      }

@@ -415,35 +416,27 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
  public boolean onOptionsItemSelected(MenuItem item) {
    super.onOptionsItemSelected(item);

-    switch (item.getItemId()) {
-      case android.R.id.home:
-        backPressed = true;
-        finish();
-        return true;
-      case R.id.menu_mute_notifications:
-        onNotifyOnOff();
-        break;
-      case R.id.menu_sound:
-        onSoundSettings();
-        break;
-      case R.id.menu_vibrate:
-        onVibrateSettings();
-        break;
-      case R.id.edit_name:
-        onEditName();
-        break;
-      case R.id.share:
-        onShare();
-        break;
-      case R.id.show_encr_info:
-        onEncrInfo();
-        break;
-      case R.id.block_contact:
-        onBlockContact();
-        break;
-      case R.id.menu_clone:
-        onClone();
-        break;
+    int itemId = item.getItemId();
+    if (itemId == android.R.id.home) {
+      backPressed = true;
+      finish();
+      return true;
+    } else if (itemId == R.id.menu_mute_notifications) {
+      onNotifyOnOff();
+    } else if (itemId == R.id.menu_sound) {
+      onSoundSettings();
+    } else if (itemId == R.id.menu_vibrate) {
+      onVibrateSettings();
+    } else if (itemId == R.id.edit_name) {
+      onEditName();
+    } else if (itemId == R.id.share) {
+      onShare();
+    } else if (itemId == R.id.show_encr_info) {
+      onEncrInfo();
+    } else if (itemId == R.id.block_contact) {
+      onBlockContact();
+    } else if (itemId == R.id.menu_clone) {
+      onClone();
    }

    return false;
@@ -452,10 +445,8 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
  @Override
  public boolean onContextItemSelected(MenuItem item) {
    super.onContextItemSelected(item);
-    switch (item.getItemId()) {
-      case R.id.copy_addr_to_clipboard:
-        onCopyAddrToClipboard();
-        break;
+    if (item.getItemId() == R.id.copy_addr_to_clipboard) {
+      onCopyAddrToClipboard();
    }
    return false;
  }
@@ -1,12 +1,13 @@
 package org.thoughtcrime.securesms;

 import android.content.Context;
-import androidx.annotation.NonNull;
 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;

@@ -5,7 +5,6 @@ import static com.b44t.messenger.DcChat.DC_CHAT_NO_CHAT;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -122,7 +121,13 @@ public class ProfileDocumentsFragment

    noMedia.setVisibility(recyclerView.getAdapter().getItemCount() > 0 ? View.GONE : View.VISIBLE);
    if (chatId == DC_CHAT_NO_CHAT) {
-      noMedia.setText(R.string.tab_all_media_empty_hint);
+      if (showWebxdc) {
+        noMedia.setText(R.string.all_apps_empty_hint);
+      } else if (!showAudio){
+        noMedia.setText(R.string.all_files_empty_hint);
+      } else {
+        noMedia.setText(R.string.tab_all_media_empty_hint);
+      }
    } else if (showAudio) {
      noMedia.setText(R.string.tab_audio_empty_hint);
    } else if (showWebxdc) {
@@ -243,35 +248,35 @@ public class ProfileDocumentsFragment

    @Override
    public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
-      switch (menuItem.getItemId()) {
-        case R.id.details:
-          handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
-          mode.finish();
-          return true;
-        case R.id.delete:
-          handleDeleteMessages(chatId, getListAdapter().getSelectedMedia());
-          mode.finish();
-          return true;
-        case R.id.share:
-          handleShare(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
-          return true;
-        case R.id.menu_add_to_home_screen:
-          WebxdcActivity.addToHomeScreen(getActivity(), getSelectedMessageRecord(getListAdapter().getSelectedMedia()).getId());
-          mode.finish();
-          return true;
-        case R.id.show_in_chat:
-          handleShowInChat(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
-          return true;
-        case R.id.save:
-          handleSaveAttachment(getListAdapter().getSelectedMedia());
-          return true;
-        case R.id.menu_resend:
-          handleResendMessage(getListAdapter().getSelectedMedia());
-          return true;
-        case R.id.menu_select_all:
-          getListAdapter().selectAll();
-          updateActionModeBar();
-          return true;
+      int itemId = menuItem.getItemId();
+      if (itemId == R.id.details) {
+        handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
+        mode.finish();
+        return true;
+      } else if (itemId == R.id.delete) {
+        handleDeleteMessages(chatId, getListAdapter().getSelectedMedia());
+        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());
+        mode.finish();
+        return true;
+      } else if (itemId == R.id.show_in_chat) {
+        handleShowInChat(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
+        return true;
+      } else if (itemId == R.id.save) {
+        handleSaveAttachment(getListAdapter().getSelectedMedia());
+        return true;
+      } else if (itemId == R.id.menu_resend) {
+        handleResendMessage(getListAdapter().getSelectedMedia());
+        return true;
+      } else if (itemId == R.id.menu_select_all) {
+        getListAdapter().selectAll();
+        updateActionModeBar();
+        return true;
      }
      return false;
    }
@@ -1,12 +1,13 @@
 package org.thoughtcrime.securesms;

 import android.content.Context;
-import androidx.annotation.NonNull;
 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;

@@ -5,14 +5,7 @@ import static com.b44t.messenger.DcChat.DC_CHAT_NO_CHAT;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.os.Build;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.view.ActionMode;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -21,6 +14,13 @@ import android.view.ViewGroup;
 import android.view.Window;
 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;
@@ -233,31 +233,31 @@ public class ProfileGalleryFragment

    @Override
    public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
-      switch (menuItem.getItemId()) {
-        case R.id.details:
-          handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
-          mode.finish();
-          return true;
-        case R.id.delete:
-          handleDeleteMessages(chatId, getListAdapter().getSelectedMedia());
-          mode.finish();
-          return true;
-        case R.id.share:
-          handleShare(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
-          return true;
-        case R.id.show_in_chat:
-          handleShowInChat(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
-          return true;
-        case R.id.save:
-          handleSaveAttachment(getListAdapter().getSelectedMedia());
-          return true;
-        case R.id.menu_resend:
-          handleResendMessage(getListAdapter().getSelectedMedia());
-          return true;
-        case R.id.menu_select_all:
-          getListAdapter().selectAll();
-          updateActionModeBar();
-          return true;
+      int itemId = menuItem.getItemId();
+      if (itemId == R.id.details) {
+        handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
+        mode.finish();
+        return true;
+      } else if (itemId == R.id.delete) {
+        handleDeleteMessages(chatId, getListAdapter().getSelectedMedia());
+        mode.finish();
+        return true;
+      } else if (itemId == R.id.share) {
+        handleShare(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
+        return true;
+      } else if (itemId == R.id.show_in_chat) {
+        handleShowInChat(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
+        return true;
+      } else if (itemId == R.id.save) {
+        handleSaveAttachment(getListAdapter().getSelectedMedia());
+        return true;
+      } else if (itemId == R.id.menu_resend) {
+        handleResendMessage(getListAdapter().getSelectedMedia());
+        return true;
+      } else if (itemId == R.id.menu_select_all) {
+        getListAdapter().selectAll();
+        updateActionModeBar();
+        return true;
      }
      return false;
    }
@@ -20,6 +20,7 @@ import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListItem;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.util.DateUtils;
+import org.thoughtcrime.securesms.util.ResUtil;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration.StickyHeaderAdapter;

 import java.util.ArrayList;
@@ -330,7 +331,8 @@ public class ProfileSettingsAdapter extends RecyclerView.Adapter
        itemData.add(new ItemData(ItemData.CATEGORY_INFO, INFO_LAST_SEEN, lastSeenTxt, 0, 0));


-        itemData.add(new ItemData(ItemData.CATEGORY_INFO, INFO_SEND_MESSAGE_BUTTON, context.getString(R.string.send_message), R.color.def_accent, 0));
+        int color = ResUtil.getColor(context, R.attr.colorAccent);
+        itemData.add(new ItemData(ItemData.CATEGORY_INFO, INFO_SEND_MESSAGE_BUTTON, context.getString(R.string.send_message), color, 0));
      }

      itemDataStatusText = dcContact.getStatus();
@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -281,29 +280,28 @@ public class ProfileSettingsFragment extends Fragment

    @Override
    public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
-      switch (menuItem.getItemId()) {
-        case R.id.delete:
-          final Collection<Integer> toDelIds = adapter.getSelectedMembers();
-          StringBuilder readableToDelList = new StringBuilder();
-          for (Integer toDelId : toDelIds) {
-            if(readableToDelList.length()>0) {
-              readableToDelList.append(", ");
-            }
-            readableToDelList.append(dcContext.getContact(toDelId).getDisplayName());
+      if (menuItem.getItemId() == R.id.delete) {
+        final Collection<Integer> toDelIds = adapter.getSelectedMembers();
+        StringBuilder readableToDelList = new StringBuilder();
+        for (Integer toDelId : toDelIds) {
+          if (readableToDelList.length() > 0) {
+            readableToDelList.append(", ");
          }
-          DcChat dcChat = dcContext.getChat(chatId);
-          AlertDialog dialog = new AlertDialog.Builder(getContext())
-              .setPositiveButton(R.string.remove_desktop, (d, which) -> {
-                for (Integer toDelId : toDelIds) {
-                  dcContext.removeContactFromChat(chatId, toDelId);
-                }
-                mode.finish();
-              })
-              .setNegativeButton(android.R.string.cancel, null)
-              .setMessage(getString(dcChat.isBroadcast()? R.string.ask_remove_from_broadcast : R.string.ask_remove_members, readableToDelList))
-              .show();
-          Util.redPositiveButton(dialog);
-          return true;
+          readableToDelList.append(dcContext.getContact(toDelId).getDisplayName());
+        }
+        DcChat dcChat = dcContext.getChat(chatId);
+        AlertDialog dialog = new AlertDialog.Builder(getContext())
+          .setPositiveButton(R.string.remove_desktop, (d, which) -> {
+            for (Integer toDelId : toDelIds) {
+              dcContext.removeContactFromChat(chatId, toDelId);
+            }
+            mode.finish();
+          })
+          .setNegativeButton(android.R.string.cancel, null)
+          .setMessage(getString(dcChat.isBroadcast() ? R.string.ask_remove_from_broadcast : R.string.ask_remove_members, readableToDelList))
+          .show();
+        Util.redPositiveButton(dialog);
+        return true;
      }
      return false;
    }
@@ -321,12 +319,15 @@ public class ProfileSettingsFragment extends Fragment
    super.onActivityResult(requestCode, resultCode, data);
    if (requestCode==REQUEST_CODE_PICK_CONTACT && resultCode==Activity.RESULT_OK && data!=null) {
      List<String> selected = data.getStringArrayListExtra("contacts");
-      for (String addr : selected) {
-        if (addr!=null) {
-          int toAddId = dcContext.createContact(null, addr);
-          dcContext.addContactToChat(chatId, toAddId);
+      if(selected == null) return;
+      Util.runOnAnyBackgroundThread(() -> {
+        for (String addr : selected) {
+          if (addr!=null) {
+            int toAddId = dcContext.createContact(null, addr);
+            dcContext.addContactToChat(chatId, toAddId);
+          }
        }
-      }
+      });
    }
  }
 }
@@ -31,9 +31,8 @@ public class ProfileSettingsItem extends LinearLayout {
    labelView.setText(label==null? "" : label);
    labelView.setCompoundDrawablesWithIntrinsicBounds(iconLeft, 0,0,0);

-    // we need different color getters as `labelColor` is `R.color.name` while default is `R.attr.name`
    if (labelColor != 0) {
-      labelView.setTextColor(ContextCompat.getColor(getContext(), labelColor));
+      labelView.setTextColor(labelColor);
    } else {
      labelView.setTextColor(ResUtil.getColor(getContext(), R.attr.emoji_text_color));
    }
@@ -6,17 +6,16 @@ import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_MAIL_PORT;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_MAIL_SECURITY;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_MAIL_SERVER;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_MAIL_USER;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_ENABLED;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SEND_PASSWORD;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SEND_PORT;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SEND_SECURITY;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SEND_SERVER;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SEND_USER;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SERVER_FLAGS;
-import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_ENABLED;
 import static org.thoughtcrime.securesms.connect.DcHelper.getContext;
 import static org.thoughtcrime.securesms.service.IPCAddAccountsService.ACCOUNT_DATA;

-import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -438,7 +437,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
                        .setPositiveButton(R.string.perm_continue, (dialog, which)-> {
                            // pass control to browser, we'll be back in business at (**)
                            activity.oauth2Requested = System.currentTimeMillis();
-                            IntentUtils.showBrowserIntent(activity, oauth2url);
+                            IntentUtils.showInBrowser(activity, oauth2url);
                            oauth2started.set(true);
                        })
                        .setCancelable(false)
@@ -493,11 +492,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
        if (provider!=null) {
            String url = provider.getOverviewPage();
            if(!url.isEmpty()) {
-                try {
-                    startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
-                } catch (ActivityNotFoundException e) {
-                    Toast.makeText(this, R.string.no_browser_installed, Toast.LENGTH_LONG).show();
-                }
+                IntentUtils.showInBrowser(this, url);
            } else {
                // this should normally not happen
                Toast.makeText(this, "ErrProviderWithoutUrl", Toast.LENGTH_LONG).show();
@@ -1,5 +1,7 @@
 package org.thoughtcrime.securesms;

+import static org.thoughtcrime.securesms.util.MediaUtil.getMimeType;
+
 import android.app.Activity;
 import android.database.Cursor;
 import android.net.Uri;
@@ -14,8 +16,6 @@ import java.io.InputStream;
 import java.lang.ref.WeakReference;
 import java.util.HashSet;

-import static org.thoughtcrime.securesms.util.MediaUtil.getMimeType;
-
 import de.cketti.safecontentresolver.SafeContentResolver;

 public class ResolveMediaTask extends AsyncTask<Uri, Void, Uri> {
@@ -34,7 +34,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.pm.ShortcutManagerCompat;

 import com.b44t.messenger.DcContext;

@@ -58,6 +57,7 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity implement
 {
  private static final String TAG = ShareActivity.class.getSimpleName();

+  public static final String EXTRA_ACC_ID = "acc_id";
  public static final String EXTRA_CHAT_ID = "chat_id";
  public static final String EXTRA_MSG_TYPE = "msg_type";
  public static final String EXTRA_MSG_SUBJECT = "msg_subject";
@@ -213,14 +213,10 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity implement
  }

  private void handleResolvedMedia(Intent intent) {
+    int       accId            = intent.getIntExtra(EXTRA_ACC_ID, -1);
    int       chatId           = intent.getIntExtra(EXTRA_CHAT_ID, -1);
    String    msgType          = intent.getStringExtra(EXTRA_MSG_TYPE);

-    String shortcutId = intent.getStringExtra(ShortcutManagerCompat.EXTRA_SHORTCUT_ID);
-    if (chatId == -1 && shortcutId != null) {
-      chatId = Integer.parseInt(shortcutId);
-    }
-
    String[] extraEmail = getIntent().getStringArrayExtra(Intent.EXTRA_EMAIL);
    /*
    usually, external app will try to start "e-mail sharing" intent, providing it:
@@ -259,28 +255,21 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity implement
    }
  */

-    String addr = null;
    if(chatId == -1 && extraEmail != null && extraEmail.length > 0) {
-      addr = extraEmail[0];
+      final String addr = extraEmail[0];
      int contactId = dcContext.lookupContactIdByAddr(addr);

-      if(contactId != 0 || !dcContext.isChatmail()) {
-        if(contactId == 0) {
-          contactId = dcContext.createContact(null, addr);
-        }
-
-        chatId = dcContext.createChatByContactId(contactId);
-        addr = null;
+      if(contactId == 0) {
+        contactId = dcContext.createContact(null, addr);
      }
+
+      chatId = dcContext.createChatByContactId(contactId);
    }
    Intent composeIntent;
-    if (addr != null) {
-      composeIntent = new Intent(this, ConversationListActivity.class);
-      composeIntent.putExtra(ConversationListActivity.WARN_CANNOT_ENCRYPT, addr);
-      startActivity(composeIntent);
-    } else if (chatId != -1) {
+    if (accId != -1 && chatId != -1) {
      composeIntent = getBaseShareIntent(ConversationActivity.class);
      composeIntent.putExtra(ConversationActivity.CHAT_ID_EXTRA, chatId);
+      composeIntent.putExtra(ConversationActivity.ACCOUNT_ID_EXTRA, accId);
      RelayUtil.setSharedType(composeIntent, msgType);
      RelayUtil.setSharedUris(composeIntent, resolvedExtras);
      startActivity(composeIntent);
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms;

 import android.content.Context;
+
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;

@@ -1,6 +1,9 @@
 package org.thoughtcrime.securesms;

+import static org.thoughtcrime.securesms.TransportOption.Type;
+
 import android.content.Context;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

@@ -9,8 +12,6 @@ import org.thoughtcrime.securesms.util.guava.Optional;
 import java.util.LinkedList;
 import java.util.List;

-import static org.thoughtcrime.securesms.TransportOption.Type;
-
 public class TransportOptions {
  private final List<OnTransportChangedListener> listeners = new LinkedList<>();
  private final Context                          context;
@@ -1,8 +1,6 @@
 package org.thoughtcrime.securesms;

 import android.content.Context;
-
-import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,6 +8,8 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;

+import androidx.annotation.NonNull;
+
 import org.thoughtcrime.securesms.util.ViewUtil;

 import java.util.List;
@@ -1,12 +1,13 @@
 package org.thoughtcrime.securesms;

 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.ListPopupWindow;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;

+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.ListPopupWindow;
+
 import java.util.LinkedList;
 import java.util.List;

@@ -1,9 +1,5 @@
 package org.thoughtcrime.securesms;

-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
@@ -20,12 +16,13 @@ import android.widget.Toast;
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.SearchView;
+import androidx.webkit.ProxyConfig;
+import androidx.webkit.ProxyController;
 import androidx.webkit.WebSettingsCompat;
 import androidx.webkit.WebViewFeature;
-import androidx.webkit.ProxyController;
-import androidx.webkit.ProxyConfig;

 import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.IntentUtils;

 public class WebViewActivity extends PassphraseRequiredActionBarActivity
                               implements SearchView.OnQueryTextListener,
@@ -253,24 +250,24 @@ public class WebViewActivity extends PassphraseRequiredActionBarActivity
  @Override
  public boolean onOptionsItemSelected(MenuItem item) {
    super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
-      case android.R.id.home:
-        finish();
-        return true;
-      case R.id.menu_search_up:
-        if (lastQuery.isEmpty()) {
-          webView.scrollTo(0, 0);
-        } else {
-          webView.findNext(false);
-        }
-        return true;
-      case R.id.menu_search_down:
-        if (lastQuery.isEmpty()) {
-          webView.scrollTo(0, 1000000000);
-        } else {
-          webView.findNext(true);
-        }
-        return true;
+    int itemId = item.getItemId();
+    if (itemId == android.R.id.home) {
+      finish();
+      return true;
+    } else if (itemId == R.id.menu_search_up) {
+      if (lastQuery.isEmpty()) {
+        webView.scrollTo(0, 0);
+      } else {
+        webView.findNext(false);
+      }
+      return true;
+    } else if (itemId == R.id.menu_search_down) {
+      if (lastQuery.isEmpty()) {
+        webView.scrollTo(0, 1000000000);
+      } else {
+        webView.findNext(true);
+      }
+      return true;
    }
    return false;
  }
@@ -278,16 +275,8 @@ public class WebViewActivity extends PassphraseRequiredActionBarActivity
  // onBackPressed() can be overwritten by derived classes as needed.
  // the default behavior (close the activity) is just fine eg. for Webxdc, Connectivity, HTML-mails

-  public static void openUrlInBrowser(Context context, String url) {
-    try {
-      context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
-    } catch (ActivityNotFoundException e) {
-      Toast.makeText(context, R.string.no_browser_installed, Toast.LENGTH_LONG).show();
-    }
-  }
-
  protected boolean openOnlineUrl(String url) {
-    openUrlInBrowser(this, url);
+    IntentUtils.showInBrowser(this, url);
    // returning `true` causes the WebView to abort loading
    return true;
  }
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`Schreibe Nachrichten mit E-Mails. Retro, Offen. Privatsphäre im Design.`
@@ -1 +1 @@
 .77.0
 .83.0