Fix LocationListenerCompat compilation error - use correct interface for LocationManagerCompat

Co-authored-by: adbenitez <24558636+adbenitez@users.noreply.github.com>

.github/workflows/release.yml

@@ -59,27 +59,12 @@ jobs:
           rm build/outputs/apk/foss/release/*universal*
           ./gradlew assembleGplayRelease
           mv build/outputs/apk/gplay/release/*universal* build/outputs/apk/foss/release/ArcaneChat-gplay.apk
-          mv build/outputs/mapping/fossRelease/mapping.txt build/outputs/mapping/fossRelease/mapping-foss.txt
-          mv build/outputs/mapping/gplayRelease/mapping.txt build/outputs/mapping/fossRelease/mapping-gplay.txt
 
-      - name: Release on GitHub
+      - name: Release
         uses: softprops/action-gh-release@v1
         with:
           token: "${{ secrets.GITHUB_TOKEN }}"
           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
-            build/outputs/mapping/fossRelease/mapping-*.txt
-
-      - name: Release on ZapStore
-        run: |
-          export CHECKSUM=6e2c7cf6da53c3f1a78b523a6aacd6316dce3d74ace6f859c2676729ee439990
-          curl -sL https://cdn.zapstore.dev/$CHECKSUM -o zapstore
-          if echo "$CHECKSUM zapstore" | sha256sum -c --status; then
-            chmod +x zapstore
-            SIGN_WITH=${{ secrets.NOSTR_KEY }} ./zapstore publish --indexer-mode
-          else
-            echo "ERROR: checksum doesn't match!"
-          fi
+          files: build/outputs/apk/foss/release/*.apk

CHANGELOG-upstream.md

@@ -2,66 +2,18 @@
 
 ## Unreleased
 
-* Improve switch speed when changing profiles
-* Allow to switch profile when sharing or forwarding
-* Display message views count for channel owners
-* Don't notify notification-to-all from in-chat apps if the chat is muted
-* Allow to see inbox quota for all relays in connectivity screen
-* Truncate file names in the middle, not at the end; important information are more often at the end
-* Remove email address from user profile
-* Mark external links with " ↗" to make them clear
-* Make QR code larger on "Add Second Device" screen
-* Add indication for blocked contacts in user profile
-* Show hint for empty contact search results
-* Fix: Show dialog if pasted QR codes are invalid
-* Fix: Refresh chat list when returning from conversation if selected profile changed
-* Fix: Update menu when using "select all" in contact selection
-* Fix: Avoid empty profiles after using "add as second device" from welcome screen
-* Fix multi-device seen messages synchronization when using multiple relays
-* Update to core 2.39.0
-
-## v2.35.0
-2026-01
-
-* Protect profile deletion and relays management with system lock/pin
-* Fix: Remove address from profile switcher
-* Fix: Avoid crash if the system doesn't allow to start foreground service
-* Remove deprecated "real-time apps" switch
-* Update to core 2.35.0
-
-## v2.34.0
-2025-12
-
-* Allow to add relay from clipboard or image if camera permission is not granted
-* Avoid crash in the "View Log" screen
-* Update to core 2.34.0
-
-## v2.33.1
-2025-12
-
-* Target Android 16
 * Change color of links in text messages
-* Improve edge-to-edge support
-* Add the option (opt-in) to send anonymous statistics to Delta Chat's developers
-* Metadata protection: protect message recipients
 * Allow to withdraw channel invite links and QR codes
 * Allow to open externally links clicked inside in-chat apps
 * Do not show "1 member" when the process of joining the group is not finished
-* Make search case-insensitive for non-ASCII chat and contact names
 * Improve handling of video recoding
 * Send .webm videos as file, they are not supported by all platforms
 * Tweak advanced section and wording of some advanced options
 * Fix: avoid crash in push notifications handling
-* Fix: avoid freezing in background
-* Fix: clean up web storage of deleted in-chat apps
-* Fix: avoid crash when exporting some files with wrong image MIME type
 * Expose new "Multi-device mode" option instead of "Delete from server" for chatmail profiles
 * Opened in-chat apps got a 'About Apps' menu item
 * Avoid gray avatar on profile creation
-* Avoid last item in chat list being covered by the floating button
-* Add disk usage statistics to log
-* New experimental feature: several addresses per profile
-* Update to core 2.33.0
+* Update to core 2.28.0
 
 ## v2.25.0
 2025-11

build.gradle

@@ -21,7 +21,7 @@ android {
     }
     namespace "org.thoughtcrime.securesms"
     flavorDimensions "none"
-    compileSdk 36
+    compileSdk 35
 
     // Set NDK version to strip native libraries.
     // Even though we compile our libraries outside Gradle with `scripts/ndk-make.sh`,
@@ -33,14 +33,14 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 30000736
-        versionName "2.36.0"
+        versionCode 30000732
+        versionName "2.25.0"
 
         applicationId "chat.delta.lite"
         multiDexEnabled true
 
         minSdkVersion 21
-        targetSdkVersion 36
+        targetSdkVersion 35
 
         vectorDrawables.useSupportLibrary = true
 
@@ -211,7 +211,6 @@ dependencies {
     implementation "io.noties.markwon:inline-parser:$markwon_version"
     implementation 'com.airbnb.android:lottie:4.2.2' // Lottie animations support.
 
-    implementation 'androidx.concurrent:concurrent-futures:1.3.0'
     implementation 'androidx.sharetarget:sharetarget:1.2.0'
     implementation 'androidx.webkit:webkit:1.14.0'
     implementation 'androidx.multidex:multidex:2.0.1'

fastlane/metadata/android/ru-RU/full_description.txt

@@ -1,36 +0,0 @@
-ArcaneChat — децентрализованный и защищённый мессенджер, удобный для друзей и семьи.
-
-• Анонимность. Мгновенный вход без номера телефона, e-mail или других личных данных.
-
-• Гибкость. Поддерживает несколько профилей чатов и легко настраивается на нескольких устройствах.
-
-• Расширяемость. В чатах можно использовать мини-приложения: списки покупок, календари или игры.
-
-• Надёжность. Работает даже при плохом соединении и в сложных сетевых условиях.
-
-• Безопасность. Проверенное сквозное шифрование, защищённое от сетевых и серверных атак.
-
-• Самостоятельность. Может работать с вашим собственным e-mail-адресом или сервером.
-
-ArcaneChat — клиент Delta Chat, разработанный с акцентом на удобство, качественный UX и экономию трафика. Также приложение часто экспериментирует с новыми функциями, которые со временем могут быть добавлены в официальный клиент Delta Chat.
-
-<b>Основные отличия от официального клиента Delta Chat:</b>
-
-<ul>
-<li>Поддержка некоторых стилей markdown в текстовых сообщениях (жирный, курсив, зачёркнутый и т.д.)</li>
-<li>Поддержка отображения анимированных стикеров Telegram (.tgs-файлы)</li>
-<li>Поддержка предпросмотра SVG-изображений</li>
-<li>Несколько цветовых тем/скинов</li>
-<li>Возможность отключать профили, полностью отключая им доступ в сеть для экономии трафика</li>
-<li>На панели переключения профилей видно состояние подключения каждого профиля</li>
-<li>Дополнительная опция для обмена местоположением на 12 часов</li>
-<li>Нажатие на сообщение с POI открывает его на карте</li>
-<li>Статус «был(а) в сети» отображается в списке контактов, как в WhatsApp, Telegram и т.д.</li>
-<li>Видео воспроизводятся по кругу — удобно для коротких GIF-видео</li>
-<li>У чата «Device Messages» в списке чатов отображается значок подтверждения</li>
-<li>В режиме «низкое качество» голосовые сообщения сжимаются сильнее для экономии трафика</li>
-<li>Автоматическая загрузка сообщений по умолчанию ограничена 640KB</li>
-<li>Отображаемое имя профиля всегда видно в заголовке приложения вместо названия приложения</li>
-<li>Для разработчиков мини-приложений: доступны дополнительные возможности WebXDC API, см. https://github.com/ArcaneChat/android/#webxdc</li>
-<li>Более удобная организация настроек с дополнительным разделом «Privacy»</li>
-</ul>

fastlane/metadata/android/ru-RU/short_description.txt

@@ -1 +0,0 @@
-⚡ Быстрые зашифрованные чаты для семьи 🎉

fastlane/metadata/android/ru-RU/title.txt

@@ -1 +0,0 @@
-ArcaneChat

flake.nix

@@ -18,7 +18,7 @@
             build-tools-35-0-0
             cmdline-tools-latest
             platform-tools
-            platforms-android-36
+            platforms-android-35
             ndk-27-2-12479018
           ]);
         rust-version = pkgs.lib.removeSuffix "\n"

jni/dc_wrapper.c

@@ -1957,7 +1957,7 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcBackupProvider_getQr(JNIEnv *env, jo
 
 JNIEXPORT jstring Java_com_b44t_messenger_DcBackupProvider_getQrSvg(JNIEnv *env, jobject obj)
 {
-    char* temp = dc_create_qr_svg(dc_backup_provider_get_qr(get_dc_backup_provider(env, obj)));
+    char* temp = dc_backup_provider_get_qr_svg(get_dc_backup_provider(env, obj));
         jstring ret = JSTRING_NEW(temp);
     dc_str_unref(temp);
     return ret;

makefile

@@ -1,83 +0,0 @@
-.PHONY: apk
-apk:
-	./scripts/rebrand.sh
-	./gradlew --offline assembleGplayRelease
-	./scripts/undo_rebrand.sh
-
-.PHONY: aab
-aab:
-	./scripts/rebrand.sh
-	sed -i 's/signingConfigs.releaseApk/signingConfigs.releaseBundle/g' build.gradle
-	./gradlew --offline bundleGplayRelease
-	sed -i 's/signingConfigs.releaseBundle/signingConfigs.releaseApk/g' build.gradle
-	./scripts/undo_rebrand.sh
-
-.PHONY: foss
-foss:
-	./scripts/rebrand.sh
-	./gradlew --offline assembleFossRelease
-	./scripts/undo_rebrand.sh
-
-.PHONY: install
-install:
-	adb -d install -r build/outputs/apk/gplay/release/*universal*.apk
-
-.PHONY: emulator-install
-emulator-install:
-	adb install -r build/outputs/apk/gplay/release/*universal*.apk
-
-.PHONY: fetch
-fetch:
-	git fetch upstream
-
-.PHONY: clean
-clean:
-	./gradlew --offline clean
-
-
-# CORE:
-
-.PHONY: fetch-core
-fetch-core:
-	cd ../core && git fetch upstream
-
-.PHONY: core
-core:
-	rmdir jni/deltachat-core-rust; mv ../core jni/deltachat-core-rust; true
-	./scripts/ndk-make.sh; true
-	./scripts/undo_rebrand.sh
-	mv jni/deltachat-core-rust ../core
-	mkdir jni/deltachat-core-rust
-
-.PHONY: core-fast
-core-fast:
-	rmdir jni/deltachat-core-rust; mv ../core jni/deltachat-core-rust; true
-	./scripts/ndk-make.sh arm64-v8a; true
-	./scripts/undo_rebrand.sh
-	mv jni/deltachat-core-rust ../core
-	mkdir jni/deltachat-core-rust
-
-.PHONY: core-v7
-core-v7:
-	rmdir jni/deltachat-core-rust; mv ../core jni/deltachat-core-rust; true
-	./scripts/ndk-make.sh armeabi-v7a; true
-	./scripts/undo_rebrand.sh
-	mv jni/deltachat-core-rust ../core
-	mkdir jni/deltachat-core-rust
-
-.PHONY: core-x86
-core-x86:
-	rmdir jni/deltachat-core-rust; mv ../core jni/deltachat-core-rust; true
-	./scripts/ndk-make.sh x86; true
-	./scripts/undo_rebrand.sh
-	mv jni/deltachat-core-rust ../core
-	mkdir jni/deltachat-core-rust
-
-.PHONY: link
-link:
-	rmdir jni/deltachat-core-rust; mv ../core jni/deltachat-core-rust; true
-
-.PHONY: unlink
-unlink:
-	mv jni/deltachat-core-rust ../core
-	mkdir jni/deltachat-core-rust

scripts/create-local-help.sh

@@ -1,2 +1 @@
-rm src/main/assets/help/*.png
 ../deltachat-pages/tools/create-local-help.py ../deltachat-pages/result src/main/assets/help

scripts/rebrand.sh

@@ -6,4 +6,3 @@ find ./src/main/assets/help/ -type f -name '*.html' | xargs sed -i 's/Delta Chat
 find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/get.delta.chat/github.com\/ArcaneChat/g'
 find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/delta.chat\/donate/arcanechat.me\/#contribute/g'
 find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/Delta Chat/ArcaneChat/g'
-find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/❤️/💜/g'

scripts/undo_rebrand.sh

@@ -6,7 +6,6 @@ find ./src/main/assets/help/ -type f -name '*.html' | xargs sed -i 's/ArcaneChat
 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.me\/#contribute/delta.chat\/donate/g'
 find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/ArcaneChat/Delta Chat/g'
-find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/💜/❤️/g'
 
 # don't revert the app name
 sed -i 's/>Delta Chat</>ArcaneChat</g' ./src/main/res/values/strings.xml

src/androidTest/java/com/b44t/messenger/uitests/online/OnboardingTest.java

@@ -41,7 +41,7 @@ public class OnboardingTest {
     }
     onView(withText(R.string.scan_invitation_code)).check(matches(isClickable()));
     onView(withText(R.string.import_backup_title)).check(matches(isClickable()));
-    onView(withText(R.string.manual_account_setup_option)).perform(click());
+    onView(withText(R.string.login_header)).perform(click());
     onView(withHint(R.string.email_address)).perform(replaceText(BuildConfig.TEST_ADDR));
     onView(withHint(R.string.existing_password)).perform(replaceText(BuildConfig.TEST_MAIL_PW));
     onView(withContentDescription(R.string.ok)).perform(click());

src/foss/AndroidManifest.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools">
-
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
-
-  <application>
-    <service
-        android:name=".connect.KeepAliveService"
-        android:foregroundServiceType="specialUse"
-        android:enabled="true" />
-  </application>
-
-</manifest>

src/gplay/AndroidManifest.xml

@@ -10,11 +10,6 @@
   <meta-data android:name="firebase_messaging_auto_init_enabled" android:value="false" />
 
   <application>
-    <service
-        android:name=".connect.KeepAliveService"
-        android:foregroundServiceType="dataSync"
-        android:enabled="true" />
-
     <service
         android:name=".notifications.FcmReceiveService"
         android:foregroundServiceType="dataSync"

src/gplay/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java

@@ -62,7 +62,7 @@ public class FcmReceiveService extends FirebaseMessagingService {
 
       prefixedToken = addPrefix(rawToken);
       Log.i(TAG, "FCM token: " + prefixedToken);
-      ApplicationContext.getDcAccounts().setPushDeviceToken(prefixedToken);
+      ApplicationContext.dcAccounts.setPushDeviceToken(prefixedToken);
       triedRegistering = true;
     });
   }
@@ -91,19 +91,7 @@ public class FcmReceiveService extends FirebaseMessagingService {
   @Override
   public void onMessageReceived(@NonNull RemoteMessage remoteMessage) {
     Log.i(TAG, "FCM push notification received");
-    // Note: The system can downgrade the high priority messages to normal priority
-    // if the app is not using the high priority messages for surfacing time sensitive
-    // content to the user. If the message's priority is downgraded, your app cannot
-    // start a foreground service and attempting to start one results in a
-    // ForegroundServiceStartNotAllowedException.
-    // So, it's recommended to check the result of RemoteMessage.getPriority() and
-    // confirm it's PRIORITY_HIGH() before attempting to start a foreground service.
-    // source: https://developer.android.com/develop/background-work/services/fgs/restrictions-bg-start
-    if (remoteMessage.getPriority() == RemoteMessage.PRIORITY_HIGH) {
-      FetchForegroundService.start(this);
-    } else {
-      FetchForegroundService.fetchSynchronously();
-    }
+    FetchForegroundService.start(this);
   }
 
   @Override
@@ -116,6 +104,6 @@ public class FcmReceiveService extends FirebaseMessagingService {
   public void onNewToken(@NonNull String rawToken) {
     prefixedToken = addPrefix(rawToken);
     Log.i(TAG, "new FCM token: " + prefixedToken);
-    ApplicationContext.getDcAccounts().setPushDeviceToken(prefixedToken);
+    ApplicationContext.dcAccounts.setPushDeviceToken(prefixedToken);
   }
 }

src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
 
     <!-- dangerous permissions - we need to as the user with a PermissionsRequest -->
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
@@ -38,6 +39,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
 
     <!-- force compiling emojipicker on sdk<21; runtime checks are required then -->
     <uses-sdk tools:overrideLibrary="androidx.emoji2.emojipicker"/>
@@ -207,7 +209,16 @@
     <activity android:name=".NewConversationActivity"
               android:theme="@style/TextSecure.LightNoActionBar"
               android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="true">
+
+        <intent-filter>
+            <data android:scheme="mailto"/>
+            <action android:name="android.intent.action.VIEW"/>
+            <category android:name="android.intent.category.DEFAULT"/>
+            <category android:name="android.intent.category.BROWSABLE"/>
+        </intent-filter>
+
     </activity>
 
     <activity android:name=".ContactMultiSelectionActivity"
@@ -219,20 +230,17 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".WelcomeActivity"
-              android:launchMode="singleTop"
+              android:launchMode="singleTask"
               android:theme="@style/TextSecure.LightNoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".relay.EditRelayActivity"
+    <activity android:name=".EditTransportActivity"
               android:launchMode="singleTask"
               android:windowSoftInputMode="stateUnchanged"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="true">
     </activity>
 
-    <activity android:name=".relay.RelayListActivity"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
     <activity android:name=".proxy.ProxySettingsActivity"
               android:label="@string/proxy_settings"
               android:windowSoftInputMode="stateHidden"
@@ -354,13 +362,15 @@
     <activity android:name=".calls.CallActivity"
               android:label=""
               android:theme="@style/TextSecure.LightTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode">
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
+              android:exported="true">
     </activity>
 
     <activity android:name=".WebxdcActivity"
               android:label=""
               android:theme="@style/TextSecure.LightTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode">
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
+              android:exported="true">
     </activity>
 
     <activity android:name=".WebxdcStoreActivity"
@@ -378,6 +388,11 @@
         android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
     </activity>
 
+    <service
+        android:name=".connect.KeepAliveService"
+        android:foregroundServiceType="dataSync"
+        android:enabled="true" />
+
     <service
         android:name=".geolocation.LocationBackgroundService"
         android:foregroundServiceType="location" />

src/main/assets/help/cs/help.html

@@ -15,7 +15,7 @@
       <li><a href="#what-do-the-ticks-shown-beside-outgoing-messages-mean">What do the ticks shown beside outgoing messages mean?</a></li>
       <li><a href="#edit">Correct typos and delete messages after sending</a></li>
       <li><a href="#ephemeralmsgs">How do disappearing messages work?</a></li>
-      <li><a href="#delold">What happens if I turn on “Delete Messages from Device”?</a></li>
+      <li><a href="#delold">What happens if I turn on “Delete old messages from device”?</a></li>
       <li><a href="#remove-account">How can I delete my chat profile?</a></li>
     </ul>
   </li>
@@ -26,7 +26,6 @@
       <li><a href="#kdyź-se-nedopatřením-odstraníš">Kdyź se nedopatřením odstraníš.</a></li>
       <li><a href="#nechci-již-přijímat-zprávy-ze-skupiny">Nechci již přijímat zprávy ze skupiny.</a></li>
       <li><a href="#cloning-a-group">Cloning a group</a></li>
-      <li><a href="#how-many-members-can-participate-in-a-single-group">How many members can participate in a single group?</a></li>
     </ul>
   </li>
   <li><a href="#webxdc">In-chat apps</a>
@@ -55,12 +54,11 @@
   </li>
   <li><a href="#advanced">Advanced</a>
     <ul>
-      <li><a href="#experiments">Experimental Features</a></li>
-      <li><a href="#relays">What are Relays?</a></li>
-      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
-      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as relay?</a></li>
-      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
+      <li><a href="#experimental-features">Experimental Features</a></li>
       <li><a href="#statssending">What is “Send statistics to Delta Chat’s developers”?</a></li>
+      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
+      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as transport?</a></li>
+      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
       <li><a href="#mám-zájem-o-technické-podrobnosti-kde-najdu-víc">Mám zájem o technické podrobnosti. Kde najdu víc?</a></li>
     </ul>
   </li>
@@ -77,7 +75,6 @@
       <li><a href="#tls">Are messages marked with the mail icon exposed on the Internet?</a></li>
       <li><a href="#message-metadata">How does Delta Chat protect metadata in messages?</a></li>
       <li><a href="#device-seizure">How to protect metadata and contacts when a device is seized?</a></li>
-      <li><a href="#who-sees-my-ip-address">Who sees my IP Address?</a></li>
       <li><a href="#sealedsender">Does Delta Chat support “Sealed Sender”?</a></li>
       <li><a href="#pfs">Does Delta Chat support Perfect Forward Secrecy?</a></li>
       <li><a href="#pqc">Does Delta Chat support Post-Quantum-Cryptography?</a></li>
@@ -187,8 +184,7 @@ If you add each other to <a href="#groups">groups</a>, end-to-end encryption wil
 <p>As being a private messenger,
 only friends and family you <a href="#howtoe2ee">share your QR code or invite link with</a> can write to you.</p>
 
-<p>Your friends may share your contact with other friends,
-this appears as <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Request</b></p>
+<p>Your friends may share your contact with other friends, this appears as a <strong>request</strong>.</p>
 
 <ul>
   <li>
@@ -226,10 +222,15 @@ and can tap it to start chatting with the first contact.</p>
         
       </h3>
 
-<p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
+<ul>
+  <li>
+    <p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
 or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>For performance, images are optimized and sent at a smaller size by default, but you can send it as a “file” to preserve the original.</p>
+  </li>
+  <li>
+    <p>For performance, images are optimized and sent at a smaller size by default, but you can send it as a “file” to preserve the original.</p>
+  </li>
+</ul>
     
       <h3 id="multiple-accounts">
         
@@ -260,11 +261,14 @@ or to <strong>Switch Profiles</strong>.</p>
         
       </h3>
 
-<p>Profilový obrázek lze zvolit v nastavení. Když napíšeš svému kontaktu,
-nebo přidáš nový vyfocením QR kódu, tyto kontakty automaticky uvidí tvůj profilový obrázek.</p>
-
 <ul>
-  <li>Z důvodu soukromí nikdo nevidí tvůj profilový obrázek dokud jim nenapíšeš.</li>
+  <li>
+    <p>Profilový obrázek lze zvolit v nastavení. Když napíšeš svému kontaktu,
+nebo přidáš nový vyfocením QR kódu, tyto kontakty automaticky uvidí tvůj profilový obrázek.</p>
+  </li>
+  <li>
+    <p>Z důvodu soukromí nikdo nevidí tvůj profilový obrázek dokud jim nenapíšeš.</p>
+  </li>
 </ul>
     
       <h3 id="signature">
@@ -299,8 +303,7 @@ they will see it when they view your contact details.</p>
   </li>
   <li>
     <p><strong>Archive chats</strong> if you do not want to see them in your chat list any longer.
-They remain accessible above the chat list or via search
-and are marked by <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Archived</b></p>
+Archived chats remain accessible above the chat list or via search.</p>
   </li>
   <li>
     <p>When an archived chat gets a new message, unless muted, it will <strong>pop out of the archive</strong> and back into your chat list.
@@ -335,7 +338,7 @@ By tapping <img style="vertical-align:middle; width:1.2em; margin:1px" src="../g
 you can go back to the original message in the original chat</p>
   </li>
   <li>
-    <p>Finally, you can also use “Saved Messages” to take <strong>personal notes</strong> - open the chat, type something, add a photo or a voice message etc.</p>
+    <p>Finally, you can also use “Save Messages” to take <strong>personal notes</strong> - open the chat, type something, add a photo or a voice message etc.</p>
   </li>
   <li>
     <p>As “Saved Message” are synced, they can become very handy for transferring data between devices</p>
@@ -372,18 +375,22 @@ and others will as well not always see that you are “online”.</p>
 <ul>
   <li>
     <p><strong>One tick</strong> <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick1.png" alt="" />
-means that the message was sent successfully to the <a href="#relays">relay</a>.</p>
+means that the message was sent successfully to your provider.</p>
   </li>
   <li>
     <p><strong>Two ticks</strong>  <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick2.png" alt="" />
-indicate your contact has read the message.</p>
+mean that at least one recipient’s device
+reported back to having received the message.</p>
+  </li>
+  <li>
+    <p>Recipients may have disabled read-receipts,
+so even if you see only one tick, the message may have been read.</p>
+  </li>
+  <li>
+    <p>The other way round, two ticks do not automatically mean
+that a human has read or understood the message ;)</p>
   </li>
 </ul>
-
-<p>In <a href="#groups">groups</a> the second tick means that at least one member has reported back having read the message.</p>
-
-<p>You will only get the second tick if both you and one of the recipients who read the message
-has <strong>Settings → Chats → Read Receipts</strong> enabled.</p>
     
       <h3 id="edit">
         
@@ -448,18 +455,19 @@ the (anyway encrypted) messages may take longer to get deleted from their server
       <h3 id="delold">
         
         
-          What happens if I turn on “Delete Messages from Device”? <a href="#delold" class="anchor"></a>
+          What happens if I turn on “Delete old messages from device”? <a href="#delold" class="anchor"></a>
         
         
       </h3>
 
-<p>If you want to save storage on your device, you can choose to delete old
-messages automatically.</p>
-
-<p>To turn it on, go to <strong>Settings → Chats → Delete Message from Device</strong>.
-You can set a timeframe between “after an hour” and “after a year”;
+<ul>
+  <li>If you want to save storage on your device, you can choose to delete old
+messages automatically.</li>
+  <li>To turn it on, go to “delete old messages from device” in the “Chats &amp; Media”
+settings. You can set a timeframe between “after an hour” and “after a year”;
 this way, <em>all</em> messages will be deleted from your device as soon as they are
-older than that.</p>
+older than that.</li>
+</ul>
     
       <h3 id="remove-account">
         
@@ -507,15 +515,9 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
       </h3>
 
 <ul>
-  <li>
-    <p>Z menu v pravém horním rohu, nebo stiskem příslušného tlačítka na Androidu / iOS vyber <strong>Nový hovor</strong> a pak <strong>Nová skupina</strong>.</p>
-  </li>
-  <li>
-    <p>Na další obrazovce, vyber <strong>členy skupiny</strong> a zadej <strong>Název skupiny</strong>. Také můžeš vybrat  <strong>obrázek skupiny</strong>.</p>
-  </li>
-  <li>
-    <p>Jakmile do skupiny pošleš <strong>první zprávu</strong>, všichni členové budou vyrozuměni o nové skupině a mohou do ní také psát (dokud nepošleš první zprávu členové skupiny o ní nebudou vědět).</p>
-  </li>
+  <li>Z menu v pravém horním rohu, nebo stiskem příslušného tlačítka na Androidu / iOS vyber <strong>Nový hovor</strong> a pak <strong>Nová skupina</strong>.</li>
+  <li>Na další obrazovce, vyber <strong>členy skupiny</strong> a zadej <strong>Název skupiny</strong>. Také můžeš vybrat  <strong>obrázek skupiny</strong>.</li>
+  <li>Jakmile do skupiny pošleš <strong>první zprávu</strong>, všichni členové budou vyrozuměni o nové skupině a mohou do ní také psát (dokud nepošleš první zprávu členové skupiny o ní nebudou vědět).</li>
 </ul>
     
       <h3 id="addmembers">
@@ -526,10 +528,11 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
         
       </h3>
 
-<p>All group members have the <strong>same rights</strong>.
-For this reason, everyone can delete any member or add new ones.</p>
-
 <ul>
+  <li>
+    <p>All group members have the <strong>same rights</strong>.
+For this reason, everyone can delete any member or add new ones.</p>
+  </li>
   <li>
     <p>To <strong>add or delete members</strong>, tap the group name in the chat and select the member to add or remove.</p>
   </li>
@@ -557,8 +560,10 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
         
       </h3>
 
-<p>Když nejsi členem skupiny nelze se znovu připojit. Nicméně, není to velká potíž - 
-požádej běžnou zprávou jiného člena skupiny o znovupřipojení.</p>
+<ul>
+  <li>Když nejsi členem skupiny nelze se znovu připojit. Nicméně, není to velká potíž - 
+požádej běžnou zprávou jiného člena skupiny o znovupřipojení.</li>
+</ul>
     
       <h3 id="nechci-již-přijímat-zprávy-ze-skupiny">
         
@@ -569,12 +574,15 @@ požádej běžnou zprávou jiného člena skupiny o znovupřipojení.</p>
       </h3>
 
 <ul>
-  <li>Buď se odeber ze seznamu členů a nebo vymaž celý skupinový hovor.
-K opětovnému připojení v budoucnu požádej nějakého člena skupiny o znovupřidání.</li>
-</ul>
-
-<p>Jiná možnost je “Umlčení” skupiny, což znamená nadále přijímat a také posílat zprávy, 
+  <li>
+    <p>Buď se odeber ze seznamu členů a nebo vymaž celý skupinový hovor.
+K opětovnému připojení v budoucnu požádej nějakého člena skupiny o znovupřidání.</p>
+  </li>
+  <li>
+    <p>Jiná možnost je “Umlčení” skupiny, což znamená nadále přijímat a také posílat zprávy, 
 ale nebudeš dostávat upozrnění na nově příchozí zprávy.</p>
+  </li>
+</ul>
     
       <h3 id="cloning-a-group">
         
@@ -600,21 +608,6 @@ or right-click the group in the chat list (Desktop).</p>
 <p>The new group is <strong>fully independent</strong> from the original,
 which continues to work as before.</p>
     
-      <h3 id="how-many-members-can-participate-in-a-single-group">
-        
-        
-          How many members can participate in a single group? <a href="#how-many-members-can-participate-in-a-single-group" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>There is no strict technical limit,
-but more than 150 is not recommended.</p>
-
-<p>As groups get larger, they can become socially unstable and may need a hierarchy -
-where Delta Chat is a private messenger for chatting with <a href="#groups">equal rights</a>.
-See <a href="https://en.wikipedia.org/wiki/Dunbar%27s_number">Dunbar’s number</a> for more insights.</p>
-    
       <h2 id="webxdc">
         
         
@@ -656,7 +649,7 @@ This makes Delta Chat a truly extensible messenger.</p>
     <p>In-chat apps can not send data to the Internet, or download anything.</p>
   </li>
   <li>
-    <p>An in-chat app can only exchange data within a chat, with its
+    <p>An in-chat app can only exchange data within a Delta Chat chat, with its
 copies on the devices of your chat partners. Other than that, it’s completely
 isolated from the Internet.</p>
   </li>
@@ -903,7 +896,7 @@ One device is not needed for the other to work.</p>
     <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
   </li>
   <li>
-    <p>On <strong>Windows</strong>, go to “Control Panel / Network and Internet”
+    <p>On <strong>Windows</strong>, go to <strong>Control Panel / Network and Internet</strong>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
@@ -955,21 +948,22 @@ try the <strong>manual transfer</strong> described below</p>
 <p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
-  <li>
-    <p>On the old device, go to <strong>Settings → Chats → Export Backup</strong>. Enter your
+  <li>On the old device, go to “Settings -&gt; Chats and media -&gt; Export Backup”. Enter your
 screen unlock PIN, pattern, or password. Then you can click on “Start
 Backup”. This saves the backup file to your device. Now you have to transfer
-it to the other device somehow.</p>
-  </li>
-  <li>
-    <p>On the new device, select <strong>I Already Have a Profile → Restore from Backup</strong>.
-If you use iOS and encounter difficulties,
-<a href="https://support.delta.chat/t/import-backup-to-ios/1628">this guide</a> might help you.</p>
+it to the other device somehow.</li>
+  <li>On the new device, in the “I already have a profile” menu,
+choose “restore from backup”. After import, your conversations, encryption
+keys, and media should be copied to the new device.
+    <ul>
+      <li><strong>If you use iOS:</strong> and you encounter difficulties, maybe
+<a href="https://support.delta.chat/t/import-backup-to-ios/1628">this guide</a> will
+help you.</li>
+    </ul>
   </li>
+  <li>You are now synchronized, and can use both devices for sending and receiving
+end-to-end encrypted messages with your communication partners.</li>
 </ul>
-
-<p>You are now synchronized, and can use both devices for sending and receiving
-end-to-end encrypted messages with your communication partners.</p>
     
       <h3 id="je-v-plánu-vytvořit-webovou-verzi-delta-chatu">
         
@@ -997,10 +991,10 @@ Všechny softwarové balíčky jsou na <a href="https://get.delta.chat">get.delt
         
       </h2>
     
-      <h3 id="experiments">
+      <h3 id="experimental-features">
         
         
-          Experimental Features <a href="#experiments" class="anchor"></a>
+          Experimental Features <a href="#experimental-features" class="anchor"></a>
         
         
       </h3>
@@ -1013,44 +1007,33 @@ you can try out features we are working on.</p>
 <p>You can find more information
 and give feedback in the <a href="https://support.delta.chat">Forum</a>.</p>
     
-      <h3 id="relays">
+      <h3 id="statssending">
         
         
-          What are Relays? <a href="#relays" class="anchor"></a>
+          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
         
         
       </h3>
 
-<p>Relays are used to temporarily hold messages in case your device is offline.
-Relays are cheap and dumb servers,
-that do not store data as group states, your name or avatar -
-all that exist only on your device.
-Relays are operated by different groups and people.</p>
+<p>We would like to improve Delta Chat with your help,
+which is why Delta Chat for Android asks whether you want
+to send anonymous usage statistics.</p>
 
-<p>By default, after installation, a relay is <strong>automatically set up</strong>,
-so you do not need to care about that.
-However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+<p>You can turn it on and off at
+<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
+
+<p>When you turn it on,
+weekly statistics will be automatically sent to a bot.</p>
+
+<p>We are interested e.g. in statistics like:</p>
 
 <ul>
-  <li>
-    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
-  </li>
-  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
-  </li>
-  <li>
-    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
-  </li>
+  <li>How many contacts are introduced by personally scanning a QR code?</li>
+  <li>Which versions of Delta Chat are being used?</li>
+  <li>How many messages are unencrypted?</li>
 </ul>
 
-<p>For more details and future possibilities of relays,
-you can follow discussions in the <a href="https://support.delta.chat">Forum</a>.</p>
+<p>We will <em>not</em> collect any personally identifiable information about you.</p>
     
       <h3 id="can-i-use-a-classic-email-address-with-delta-chat">
         
@@ -1072,7 +1055,7 @@ while chatmail apps and relays pervasively enforce end-to-end encryption and sec
   </li>
   <li>
     <p>Non-chatmail apps use email servers as a long-term message archive
-while chatmail clients use email servers for ephemeral instant message relay.</p>
+while chatmail clients use email servers for ephemeral instant message transport.</p>
   </li>
   <li>
     <p>Supporting the full variety of classic email setups
@@ -1084,7 +1067,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
       <h3 id="classic-email">
         
         
-          How can I configure a chat profile with a classic email address as relay? <a href="#classic-email" class="anchor"></a>
+          How can I configure a chat profile with a classic email address as transport? <a href="#classic-email" class="anchor"></a>
         
         
       </h3>
@@ -1093,7 +1076,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
 unless you are prepared to deal with encrypted messages in the inbox,
 double notifications, accidentally deleted emails or similar annoyances.</p>
 
-<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Relay</strong>.
+<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Transport</strong>.
 Note that classic email providers will generally not support <a href="#instant-delivery">Push Notifications</a>
 and have other limitations, see <a href="https://providers.delta.chat">Provider Overview</a>.
 Chatmail uses the default INBOX for relay; ensure the provider setup does too. 
@@ -1117,40 +1100,6 @@ except if your users’ devices require Google/Apple <a href="#instant-delivery"
 and <a href="https://github.com/chatmail/core">core Rust developments</a> 
 that power <a href="https://chatmail.at/clients">chatmail clients</a> of which Delta Chat is the most well known.</p>
     
-      <h3 id="statssending">
-        
-        
-          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>We would like to improve Delta Chat with your help,
-which is why Delta Chat for Android asks whether you want
-to send anonymous usage statistics.</p>
-
-<p>You can turn it on and off at
-<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
-
-<p>When you turn it on,
-weekly statistics will be automatically sent to a bot.</p>
-
-<p>We are interested e.g. in statistics like:</p>
-
-<ul>
-  <li>
-    <p>How many contacts are introduced by personally scanning a QR code?</p>
-  </li>
-  <li>
-    <p>Which versions of Delta Chat are being used?</p>
-  </li>
-  <li>
-    <p>What errors occur for users?</p>
-  </li>
-</ul>
-
-<p>We will <em>not</em> collect any personally identifiable information about you.</p>
-    
       <h3 id="mám-zájem-o-technické-podrobnosti-kde-najdu-víc">
         
         
@@ -1159,7 +1108,9 @@ weekly statistics will be automatically sent to a bot.</p>
         
       </h3>
 
-<p>Dobrý začátek je <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Standards used in Delta Chat</a>.</p>
+<ul>
+  <li>Dobrý začátek je <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Standards used in Delta Chat</a>.</li>
+</ul>
     
       <h2 id="e2ee">
         
@@ -1398,32 +1349,6 @@ with the knowledge that all their data, along with all metadata, will be deleted
 Moreover, if a device is seized then chat contacts using short-lived profiles
 can not be identified easily.</p>
     
-      <h3 id="who-sees-my-ip-address">
-        
-        
-          Who sees my IP Address? <a href="#who-sees-my-ip-address" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>The used <a href="#relays">relay</a> needs to know your IP Address,
-as well as sometimes your contact’s devices if you have a <a href="#experiments">call</a>
-or use <a href="#webxdc">apps</a> together.</p>
-
-<p>IP Addresses are needed for connectivity and efficiency.
-They are neither persisted nor exposed.
-Note that the IP Address
-is not like a detailed address you give to a delivery service,
-but much more coarse, often defining region or country only.</p>
-
-<p>As this is just how the internet and other messengers work by default,
-we do not offer options here or ask upfront questions.</p>
-
-<p>If you see your IP Address as a security or privacy risk,
-we recommend to use a VPN, in combination with system lockdown mode.
-Hunting down options in all apps on your system will leave gaps.
-For example, tapping a link exposes IP Addresses to unknown parties and is the by far larger risk here.</p>
-    
       <h3 id="sealedsender">
         
         
@@ -1510,12 +1435,12 @@ the connection is safe.</p>
 
 <p>No.</p>
 
-<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1.
-We do not recommend or offer users to perform manual key management.
-We want to ensure that security audits can focus on a few proven cryptographic algorithms
-instead of the full breadth of possible algorithms allowed with OpenPGP.
-If you want to extract your OpenPGP key, there only is an expert method:
-you need to look it up in the “keypairs” SQLite table of a profile backup tar-file.</p>
+<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1. 
+You can export your private key but you can not import additional private keys.</p>
+
+<p>In general, we do not recommend or offer users to perform manual key management. 
+We want to ensure that security audits can focus on a few proven cryptographic algorithms 
+instead of the full breadth of possible algorithms allowed with OpenPGP.</p>
     
       <h3 id="security-audits">
         
@@ -1663,38 +1588,52 @@ ordered chronologically:</p>
 
 <ul>
   <li>
-    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
-program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
-along with collaboration partners working on
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>,
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>,
-<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and
-<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>.
-All of these projects are partially completed or to be completed in early 2025.</p>
+    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
+and implementation of verified groups and setup contact protocols
+in 2017 and 2018 and also helped to integrate end-to-end Encryption
+through <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p>In 2021 we received further EU funding for two Next-Generation-Internet
-proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a 
+first 2018/2019 grant (~$200K) during which we majorly improved the Android app 
+and released a first Desktop app beta version, and which moreover 
+moored our feature developments in UX research in human rights contexts, 
+see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
+The second 2019/2020 grant (~$300K) helped us to 
+release Delta/iOS versions, to convert our core library to Rust, and
+to provide new features for all platforms.</p>
   </li>
   <li>
     <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
 completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
   </li>
   <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p>In 2021 we received further EU funding for two Next-Generation-Internet
+proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
   </li>
   <li>
-    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
-and implementation of verified groups and setup contact protocols
-in 2017 and 2018 and also helped to integrate end-to-end Encryption
-through <a href="https://autocrypt.org">Autocrypt</a>.</p>
+    <p>From End 2021 till March 2023 we received <em>Internet Freedom</em> funding (500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supported our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of email servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
+  </li>
+  <li>
+    <p>2023-2024 we successfully completed the OTF-funded 
+<a href="https://www.opentech.fund/projects-we-support/supported-projects/secure-chat-mail-with-delta-chat/">Secure Chatmail project</a>, 
+allowing us to introduce guaranteed encryption, 
+creating a <a href="https://delta.chat/chatmail">chatmail server network</a> 
+and providing “instant onboarding” in all apps released from April 2024 on.</p>
+  </li>
+  <li>
+    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
+program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
+along with collaboration partners working on 
+<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>, 
+<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>, 
+<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and 
+<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>. 
+All of these projects are partially completed or to be completed in early 2025.</p>
   </li>
   <li>
     <p>Sometimes we receive one-time donations from private individuals. 

src/main/assets/help/en/help.html

@@ -15,7 +15,7 @@
       <li><a href="#what-do-the-ticks-shown-beside-outgoing-messages-mean">What do the ticks shown beside outgoing messages mean?</a></li>
       <li><a href="#edit">Correct typos and delete messages after sending</a></li>
       <li><a href="#ephemeralmsgs">How do disappearing messages work?</a></li>
-      <li><a href="#delold">What happens if I turn on “Delete Messages from Device”?</a></li>
+      <li><a href="#delold">What happens if I turn on “Delete old messages from device”?</a></li>
       <li><a href="#remove-account">How can I delete my chat profile?</a></li>
     </ul>
   </li>
@@ -26,7 +26,6 @@
       <li><a href="#i-have-deleted-myself-by-accident">I have deleted myself by accident.</a></li>
       <li><a href="#i-do-not-want-to-receive-the-messages-of-a-group-any-longer">I do not want to receive the messages of a group any longer.</a></li>
       <li><a href="#cloning-a-group">Cloning a group</a></li>
-      <li><a href="#how-many-members-can-participate-in-a-single-group">How many members can participate in a single group?</a></li>
     </ul>
   </li>
   <li><a href="#webxdc">In-chat apps</a>
@@ -55,12 +54,11 @@
   </li>
   <li><a href="#advanced">Advanced</a>
     <ul>
-      <li><a href="#experiments">Experimental Features</a></li>
-      <li><a href="#relays">What are Relays?</a></li>
-      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
-      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as relay?</a></li>
-      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
+      <li><a href="#experimental-features">Experimental Features</a></li>
       <li><a href="#statssending">What is “Send statistics to Delta Chat’s developers”?</a></li>
+      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
+      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as transport?</a></li>
+      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
       <li><a href="#im-interested-in-the-technical-details-can-you-tell-me-more">I’m interested in the technical details. Can you tell me more?</a></li>
     </ul>
   </li>
@@ -77,7 +75,6 @@
       <li><a href="#tls">Are messages marked with the mail icon exposed on the Internet?</a></li>
       <li><a href="#message-metadata">How does Delta Chat protect metadata in messages?</a></li>
       <li><a href="#device-seizure">How to protect metadata and contacts when a device is seized?</a></li>
-      <li><a href="#who-sees-my-ip-address">Who sees my IP Address?</a></li>
       <li><a href="#sealedsender">Does Delta Chat support “Sealed Sender”?</a></li>
       <li><a href="#pfs">Does Delta Chat support Perfect Forward Secrecy?</a></li>
       <li><a href="#pqc">Does Delta Chat support Post-Quantum-Cryptography?</a></li>
@@ -187,8 +184,7 @@ If you add each other to <a href="#groups">groups</a>, end-to-end encryption wil
 <p>As being a private messenger,
 only friends and family you <a href="#howtoe2ee">share your QR code or invite link with</a> can write to you.</p>
 
-<p>Your friends may share your contact with other friends,
-this appears as <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Request</b></p>
+<p>Your friends may share your contact with other friends, this appears as a <strong>request</strong>.</p>
 
 <ul>
   <li>
@@ -226,10 +222,15 @@ and can tap it to start chatting with the first contact.</p>
         
       </h3>
 
-<p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
+<ul>
+  <li>
+    <p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
 or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>For performance, images are optimized and sent at a smaller size by default, but you can send it as a “file” to preserve the original.</p>
+  </li>
+  <li>
+    <p>For performance, images are optimized and sent at a smaller size by default, but you can send it as a “file” to preserve the original.</p>
+  </li>
+</ul>
     
       <h3 id="multiple-accounts">
         
@@ -260,11 +261,16 @@ or to <strong>Switch Profiles</strong>.</p>
         
       </h3>
 
-<p>You can add a profile picture in your settings. If you write to your contacts
+<ul>
+  <li>
+    <p>You can add a profile picture in your settings. If you write to your contacts
 or add them via QR code, they automatically see it as your profile picture.</p>
-
-<p>For privacy reasons, no one sees your profile picture until you write a
+  </li>
+  <li>
+    <p>For privacy reasons, no one sees your profile picture until you write a
 message to them.</p>
+  </li>
+</ul>
     
       <h3 id="signature">
         
@@ -298,8 +304,7 @@ they will see it when they view your contact details.</p>
   </li>
   <li>
     <p><strong>Archive chats</strong> if you do not want to see them in your chat list any longer.
-They remain accessible above the chat list or via search
-and are marked by <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Archived</b></p>
+Archived chats remain accessible above the chat list or via search.</p>
   </li>
   <li>
     <p>When an archived chat gets a new message, unless muted, it will <strong>pop out of the archive</strong> and back into your chat list.
@@ -334,7 +339,7 @@ By tapping <img style="vertical-align:middle; width:1.2em; margin:1px" src="../g
 you can go back to the original message in the original chat</p>
   </li>
   <li>
-    <p>Finally, you can also use “Saved Messages” to take <strong>personal notes</strong> - open the chat, type something, add a photo or a voice message etc.</p>
+    <p>Finally, you can also use “Save Messages” to take <strong>personal notes</strong> - open the chat, type something, add a photo or a voice message etc.</p>
   </li>
   <li>
     <p>As “Saved Message” are synced, they can become very handy for transferring data between devices</p>
@@ -371,18 +376,22 @@ and others will as well not always see that you are “online”.</p>
 <ul>
   <li>
     <p><strong>One tick</strong> <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick1.png" alt="" />
-means that the message was sent successfully to the <a href="#relays">relay</a>.</p>
+means that the message was sent successfully to your provider.</p>
   </li>
   <li>
     <p><strong>Two ticks</strong>  <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick2.png" alt="" />
-indicate your contact has read the message.</p>
+mean that at least one recipient’s device
+reported back to having received the message.</p>
+  </li>
+  <li>
+    <p>Recipients may have disabled read-receipts,
+so even if you see only one tick, the message may have been read.</p>
+  </li>
+  <li>
+    <p>The other way round, two ticks do not automatically mean
+that a human has read or understood the message ;)</p>
   </li>
 </ul>
-
-<p>In <a href="#groups">groups</a> the second tick means that at least one member has reported back having read the message.</p>
-
-<p>You will only get the second tick if both you and one of the recipients who read the message
-has <strong>Settings → Chats → Read Receipts</strong> enabled.</p>
     
       <h3 id="edit">
         
@@ -447,18 +456,19 @@ the (anyway encrypted) messages may take longer to get deleted from their server
       <h3 id="delold">
         
         
-          What happens if I turn on “Delete Messages from Device”? <a href="#delold" class="anchor"></a>
+          What happens if I turn on “Delete old messages from device”? <a href="#delold" class="anchor"></a>
         
         
       </h3>
 
-<p>If you want to save storage on your device, you can choose to delete old
-messages automatically.</p>
-
-<p>To turn it on, go to <strong>Settings → Chats → Delete Message from Device</strong>.
-You can set a timeframe between “after an hour” and “after a year”;
+<ul>
+  <li>If you want to save storage on your device, you can choose to delete old
+messages automatically.</li>
+  <li>To turn it on, go to “delete old messages from device” in the “Chats &amp; Media”
+settings. You can set a timeframe between “after an hour” and “after a year”;
 this way, <em>all</em> messages will be deleted from your device as soon as they are
-older than that.</p>
+older than that.</li>
+</ul>
     
       <h3 id="remove-account">
         
@@ -506,15 +516,9 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
       </h3>
 
 <ul>
-  <li>
-    <p>Select <strong>New chat</strong> and then <strong>New group</strong> from the menu in the upper right corner or hit the corresponding button on Android/iOS.</p>
-  </li>
-  <li>
-    <p>On the following screen, select the <strong>group members</strong> and define a <strong>group name</strong>. You can also select a <strong>group avatar</strong>.</p>
-  </li>
-  <li>
-    <p>As soon as you write the <strong>first message</strong> in the group, all members are informed about the new group and can answer in the group (as long as you do not write a message in the group the group is invisible to the members).</p>
-  </li>
+  <li>Select <strong>New chat</strong> and then <strong>New group</strong> from the menu in the upper right corner or hit the corresponding button on Android/iOS.</li>
+  <li>On the following screen, select the <strong>group members</strong> and define a <strong>group name</strong>. You can also select a <strong>group avatar</strong>.</li>
+  <li>As soon as you write the <strong>first message</strong> in the group, all members are informed about the new group and can answer in the group (as long as you do not write a message in the group the group is invisible to the members).</li>
 </ul>
     
       <h3 id="addmembers">
@@ -525,10 +529,11 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
         
       </h3>
 
-<p>All group members have the <strong>same rights</strong>.
-For this reason, everyone can delete any member or add new ones.</p>
-
 <ul>
+  <li>
+    <p>All group members have the <strong>same rights</strong>.
+For this reason, everyone can delete any member or add new ones.</p>
+  </li>
   <li>
     <p>To <strong>add or delete members</strong>, tap the group name in the chat and select the member to add or remove.</p>
   </li>
@@ -556,8 +561,10 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
         
       </h3>
 
-<p>As you’re no longer a group member, you cannot add yourself again. 
-However, no problem, just ask any other group member in a normal chat to re-add you.</p>
+<ul>
+  <li>As you’re no longer a group member, you cannot add yourself again. 
+However, no problem, just ask any other group member in a normal chat to re-add you.</li>
+</ul>
     
       <h3 id="i-do-not-want-to-receive-the-messages-of-a-group-any-longer">
         
@@ -568,12 +575,15 @@ However, no problem, just ask any other group member in a normal chat to re-add
       </h3>
 
 <ul>
-  <li>Either delete yourself from the member list or delete the whole chat. 
-If you want to join the group again later on, ask another group member to add you again.</li>
-</ul>
-
-<p>As an alternative, you can also “Mute” a group - doing so means you get all messages and 
+  <li>
+    <p>Either delete yourself from the member list or delete the whole chat. 
+If you want to join the group again later on, ask another group member to add you again.</p>
+  </li>
+  <li>
+    <p>As an alternative, you can also “Mute” a group - doing so means you get all messages and 
 can still write, but are no longer notified of any new messages.</p>
+  </li>
+</ul>
     
       <h3 id="cloning-a-group">
         
@@ -599,21 +609,6 @@ or right-click the group in the chat list (Desktop).</p>
 <p>The new group is <strong>fully independent</strong> from the original,
 which continues to work as before.</p>
     
-      <h3 id="how-many-members-can-participate-in-a-single-group">
-        
-        
-          How many members can participate in a single group? <a href="#how-many-members-can-participate-in-a-single-group" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>There is no strict technical limit,
-but more than 150 is not recommended.</p>
-
-<p>As groups get larger, they can become socially unstable and may need a hierarchy -
-where Delta Chat is a private messenger for chatting with <a href="#groups">equal rights</a>.
-See <a href="https://en.wikipedia.org/wiki/Dunbar%27s_number">Dunbar’s number</a> for more insights.</p>
-    
       <h2 id="webxdc">
         
         
@@ -655,7 +650,7 @@ This makes Delta Chat a truly extensible messenger.</p>
     <p>In-chat apps can not send data to the Internet, or download anything.</p>
   </li>
   <li>
-    <p>An in-chat app can only exchange data within a chat, with its
+    <p>An in-chat app can only exchange data within a Delta Chat chat, with its
 copies on the devices of your chat partners. Other than that, it’s completely
 isolated from the Internet.</p>
   </li>
@@ -902,7 +897,7 @@ One device is not needed for the other to work.</p>
     <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
   </li>
   <li>
-    <p>On <strong>Windows</strong>, go to “Control Panel / Network and Internet”
+    <p>On <strong>Windows</strong>, go to <strong>Control Panel / Network and Internet</strong>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
@@ -954,21 +949,22 @@ try the <strong>manual transfer</strong> described below</p>
 <p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
-  <li>
-    <p>On the old device, go to <strong>Settings → Chats → Export Backup</strong>. Enter your
+  <li>On the old device, go to “Settings -&gt; Chats and media -&gt; Export Backup”. Enter your
 screen unlock PIN, pattern, or password. Then you can click on “Start
 Backup”. This saves the backup file to your device. Now you have to transfer
-it to the other device somehow.</p>
-  </li>
-  <li>
-    <p>On the new device, select <strong>I Already Have a Profile → Restore from Backup</strong>.
-If you use iOS and encounter difficulties,
-<a href="https://support.delta.chat/t/import-backup-to-ios/1628">this guide</a> might help you.</p>
+it to the other device somehow.</li>
+  <li>On the new device, in the “I already have a profile” menu,
+choose “restore from backup”. After import, your conversations, encryption
+keys, and media should be copied to the new device.
+    <ul>
+      <li><strong>If you use iOS:</strong> and you encounter difficulties, maybe
+<a href="https://support.delta.chat/t/import-backup-to-ios/1628">this guide</a> will
+help you.</li>
+    </ul>
   </li>
+  <li>You are now synchronized, and can use both devices for sending and receiving
+end-to-end encrypted messages with your communication partners.</li>
 </ul>
-
-<p>You are now synchronized, and can use both devices for sending and receiving
-end-to-end encrypted messages with your communication partners.</p>
     
       <h3 id="are-there-any-plans-for-introducing-a-delta-chat-web-client">
         
@@ -997,10 +993,10 @@ or the AppImage for Linux. You can find them on
         
       </h2>
     
-      <h3 id="experiments">
+      <h3 id="experimental-features">
         
         
-          Experimental Features <a href="#experiments" class="anchor"></a>
+          Experimental Features <a href="#experimental-features" class="anchor"></a>
         
         
       </h3>
@@ -1013,44 +1009,33 @@ you can try out features we are working on.</p>
 <p>You can find more information
 and give feedback in the <a href="https://support.delta.chat">Forum</a>.</p>
     
-      <h3 id="relays">
+      <h3 id="statssending">
         
         
-          What are Relays? <a href="#relays" class="anchor"></a>
+          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
         
         
       </h3>
 
-<p>Relays are used to temporarily hold messages in case your device is offline.
-Relays are cheap and dumb servers,
-that do not store data as group states, your name or avatar -
-all that exist only on your device.
-Relays are operated by different groups and people.</p>
+<p>We would like to improve Delta Chat with your help,
+which is why Delta Chat for Android asks whether you want
+to send anonymous usage statistics.</p>
 
-<p>By default, after installation, a relay is <strong>automatically set up</strong>,
-so you do not need to care about that.
-However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+<p>You can turn it on and off at
+<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
+
+<p>When you turn it on,
+weekly statistics will be automatically sent to a bot.</p>
+
+<p>We are interested e.g. in statistics like:</p>
 
 <ul>
-  <li>
-    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
-  </li>
-  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
-  </li>
-  <li>
-    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
-  </li>
+  <li>How many contacts are introduced by personally scanning a QR code?</li>
+  <li>Which versions of Delta Chat are being used?</li>
+  <li>How many messages are unencrypted?</li>
 </ul>
 
-<p>For more details and future possibilities of relays,
-you can follow discussions in the <a href="https://support.delta.chat">Forum</a>.</p>
+<p>We will <em>not</em> collect any personally identifiable information about you.</p>
     
       <h3 id="can-i-use-a-classic-email-address-with-delta-chat">
         
@@ -1072,7 +1057,7 @@ while chatmail apps and relays pervasively enforce end-to-end encryption and sec
   </li>
   <li>
     <p>Non-chatmail apps use email servers as a long-term message archive
-while chatmail clients use email servers for ephemeral instant message relay.</p>
+while chatmail clients use email servers for ephemeral instant message transport.</p>
   </li>
   <li>
     <p>Supporting the full variety of classic email setups
@@ -1084,7 +1069,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
       <h3 id="classic-email">
         
         
-          How can I configure a chat profile with a classic email address as relay? <a href="#classic-email" class="anchor"></a>
+          How can I configure a chat profile with a classic email address as transport? <a href="#classic-email" class="anchor"></a>
         
         
       </h3>
@@ -1093,7 +1078,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
 unless you are prepared to deal with encrypted messages in the inbox,
 double notifications, accidentally deleted emails or similar annoyances.</p>
 
-<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Relay</strong>.
+<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Transport</strong>.
 Note that classic email providers will generally not support <a href="#instant-delivery">Push Notifications</a>
 and have other limitations, see <a href="https://providers.delta.chat">Provider Overview</a>.
 Chatmail uses the default INBOX for relay; ensure the provider setup does too. 
@@ -1117,40 +1102,6 @@ except if your users’ devices require Google/Apple <a href="#instant-delivery"
 and <a href="https://github.com/chatmail/core">core Rust developments</a> 
 that power <a href="https://chatmail.at/clients">chatmail clients</a> of which Delta Chat is the most well known.</p>
     
-      <h3 id="statssending">
-        
-        
-          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>We would like to improve Delta Chat with your help,
-which is why Delta Chat for Android asks whether you want
-to send anonymous usage statistics.</p>
-
-<p>You can turn it on and off at
-<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
-
-<p>When you turn it on,
-weekly statistics will be automatically sent to a bot.</p>
-
-<p>We are interested e.g. in statistics like:</p>
-
-<ul>
-  <li>
-    <p>How many contacts are introduced by personally scanning a QR code?</p>
-  </li>
-  <li>
-    <p>Which versions of Delta Chat are being used?</p>
-  </li>
-  <li>
-    <p>What errors occur for users?</p>
-  </li>
-</ul>
-
-<p>We will <em>not</em> collect any personally identifiable information about you.</p>
-    
       <h3 id="im-interested-in-the-technical-details-can-you-tell-me-more">
         
         
@@ -1159,7 +1110,9 @@ weekly statistics will be automatically sent to a bot.</p>
         
       </h3>
 
-<p>See <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Standards used in Delta Chat</a>.</p>
+<ul>
+  <li>See <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Standards used in Delta Chat</a>.</li>
+</ul>
     
       <h2 id="e2ee">
         
@@ -1398,32 +1351,6 @@ with the knowledge that all their data, along with all metadata, will be deleted
 Moreover, if a device is seized then chat contacts using short-lived profiles
 can not be identified easily.</p>
     
-      <h3 id="who-sees-my-ip-address">
-        
-        
-          Who sees my IP Address? <a href="#who-sees-my-ip-address" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>The used <a href="#relays">relay</a> needs to know your IP Address,
-as well as sometimes your contact’s devices if you have a <a href="#experiments">call</a>
-or use <a href="#webxdc">apps</a> together.</p>
-
-<p>IP Addresses are needed for connectivity and efficiency.
-They are neither persisted nor exposed.
-Note that the IP Address
-is not like a detailed address you give to a delivery service,
-but much more coarse, often defining region or country only.</p>
-
-<p>As this is just how the internet and other messengers work by default,
-we do not offer options here or ask upfront questions.</p>
-
-<p>If you see your IP Address as a security or privacy risk,
-we recommend to use a VPN, in combination with system lockdown mode.
-Hunting down options in all apps on your system will leave gaps.
-For example, tapping a link exposes IP Addresses to unknown parties and is the by far larger risk here.</p>
-    
       <h3 id="sealedsender">
         
         
@@ -1510,12 +1437,12 @@ the connection is safe.</p>
 
 <p>No.</p>
 
-<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1.
-We do not recommend or offer users to perform manual key management.
-We want to ensure that security audits can focus on a few proven cryptographic algorithms
-instead of the full breadth of possible algorithms allowed with OpenPGP.
-If you want to extract your OpenPGP key, there only is an expert method:
-you need to look it up in the “keypairs” SQLite table of a profile backup tar-file.</p>
+<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1. 
+You can export your private key but you can not import additional private keys.</p>
+
+<p>In general, we do not recommend or offer users to perform manual key management. 
+We want to ensure that security audits can focus on a few proven cryptographic algorithms 
+instead of the full breadth of possible algorithms allowed with OpenPGP.</p>
     
       <h3 id="security-audits">
         
@@ -1663,38 +1590,52 @@ ordered chronologically:</p>
 
 <ul>
   <li>
-    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
-program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
-along with collaboration partners working on
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>,
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>,
-<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and
-<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>.
-All of these projects are partially completed or to be completed in early 2025.</p>
+    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
+and implementation of verified groups and setup contact protocols
+in 2017 and 2018 and also helped to integrate end-to-end Encryption
+through <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p>In 2021 we received further EU funding for two Next-Generation-Internet
-proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a 
+first 2018/2019 grant (~$200K) during which we majorly improved the Android app 
+and released a first Desktop app beta version, and which moreover 
+moored our feature developments in UX research in human rights contexts, 
+see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
+The second 2019/2020 grant (~$300K) helped us to 
+release Delta/iOS versions, to convert our core library to Rust, and
+to provide new features for all platforms.</p>
   </li>
   <li>
     <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
 completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
   </li>
   <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p>In 2021 we received further EU funding for two Next-Generation-Internet
+proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
   </li>
   <li>
-    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
-and implementation of verified groups and setup contact protocols
-in 2017 and 2018 and also helped to integrate end-to-end Encryption
-through <a href="https://autocrypt.org">Autocrypt</a>.</p>
+    <p>From End 2021 till March 2023 we received <em>Internet Freedom</em> funding (500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supported our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of email servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
+  </li>
+  <li>
+    <p>2023-2024 we successfully completed the OTF-funded 
+<a href="https://www.opentech.fund/projects-we-support/supported-projects/secure-chat-mail-with-delta-chat/">Secure Chatmail project</a>, 
+allowing us to introduce guaranteed encryption, 
+creating a <a href="https://delta.chat/chatmail">chatmail server network</a> 
+and providing “instant onboarding” in all apps released from April 2024 on.</p>
+  </li>
+  <li>
+    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
+program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
+along with collaboration partners working on 
+<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>, 
+<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>, 
+<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and 
+<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>. 
+All of these projects are partially completed or to be completed in early 2025.</p>
   </li>
   <li>
     <p>Sometimes we receive one-time donations from private individuals. 

src/main/assets/help/es/help.html

@@ -26,7 +26,6 @@
       <li><a href="#me-he-eliminado-por-accidente">Me he eliminado por accidente.</a></li>
       <li><a href="#no-quiero-recibir-más-los-mensajes-de-un-grupo">No quiero recibir más los mensajes de un grupo.</a></li>
       <li><a href="#cloning-a-group">Cloning a group</a></li>
-      <li><a href="#how-many-members-can-participate-in-a-single-group">How many members can participate in a single group?</a></li>
     </ul>
   </li>
   <li><a href="#webxdc">In-chat apps</a>
@@ -55,12 +54,11 @@
   </li>
   <li><a href="#advanced">Advanced</a>
     <ul>
-      <li><a href="#experiments">Experimental Features</a></li>
-      <li><a href="#relays">What are Relays?</a></li>
-      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
-      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as relay?</a></li>
-      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
+      <li><a href="#experimental-features">Experimental Features</a></li>
       <li><a href="#statssending">What is “Send statistics to Delta Chat’s developers”?</a></li>
+      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
+      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as transport?</a></li>
+      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
       <li><a href="#estoy-interesado-en-los-detalles-técnicos-pueden-decirme-más">Estoy interesado en los detalles técnicos. ¿Pueden decirme más?</a></li>
     </ul>
   </li>
@@ -77,7 +75,6 @@
       <li><a href="#tls">Are messages marked with the mail icon exposed on the Internet?</a></li>
       <li><a href="#message-metadata">¿Cómo Delta Chat protege los metadatos en los mensajes?</a></li>
       <li><a href="#device-seizure">¿Cómo proteger los metadatos y los contactos cuando se incauta un dispositivo?</a></li>
-      <li><a href="#who-sees-my-ip-address">Who sees my IP Address?</a></li>
       <li><a href="#sealedsender">Does Delta Chat support “Sealed Sender”?</a></li>
       <li><a href="#pfs">¿Soporta Delta Chat Perfect Forward Secrecy?</a></li>
       <li><a href="#pqc">Does Delta Chat support Post-Quantum-Cryptography?</a></li>
@@ -187,8 +184,7 @@ If you add each other to <a href="#groups">groups</a>, end-to-end encryption wil
 <p>As being a private messenger,
 only friends and family you <a href="#howtoe2ee">share your QR code or invite link with</a> can write to you.</p>
 
-<p>Your friends may share your contact with other friends,
-this appears as <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Request</b></p>
+<p>Your friends may share your contact with other friends, this appears as a <strong>request</strong>.</p>
 
 <ul>
   <li>
@@ -224,10 +220,15 @@ and can tap it to start chatting with the first contact.</p>
         
       </h3>
 
-<p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
+<ul>
+  <li>
+    <p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
 or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>Para mejorar el rendimiento, las imágenes se optimizan y se envían en un tamaño más pequeño de forma predeterminada, pero puedes enviarla como un “archivo” para conservar la original.</p>
+  </li>
+  <li>
+    <p>Para mejorar el rendimiento, las imágenes se optimizan y se envían en un tamaño más pequeño de forma predeterminada, pero puedes enviarla como un “archivo” para conservar la original.</p>
+  </li>
+</ul>
     
       <h3 id="multiple-accounts">
         
@@ -258,10 +259,15 @@ o para <strong>Cambiar perfiles</strong>.</p>
         
       </h3>
 
-<p>Puede agregar una foto de perfil en su configuración. Si escribe a sus contactos
+<ul>
+  <li>
+    <p>Puede agregar una foto de perfil en su configuración. Si escribe a sus contactos
 o los agrega a través de un código QR, ellos lo verán automáticamente como su foto de perfil.</p>
-
-<p>Por cuestiones de privacidad, nadie verá su foto de perfil hasta que les escriba un mensaje.</p>
+  </li>
+  <li>
+    <p>Por cuestiones de privacidad, nadie verá su foto de perfil hasta que les escriba un mensaje.</p>
+  </li>
+</ul>
     
       <h3 id="signature">
         
@@ -294,7 +300,8 @@ they will see it when they view your contact details.</p>
     <p><strong>Chats muteados</strong> si no quieres recibir notificaciones de ellos. Chats muteados se mantienen en su lugar e inclusive puedes fijarlos.</p>
   </li>
   <li>
-    <p><strong>Archivar chats</strong> si no deseas verlos en tu lista de chats. Los chats archivados siguen siendo accesibles arriba de la lista de chats o a través de la búsqueda.</p>
+    <p><strong>Archivar chats</strong> si no deseas verlos en tu lista de chats.
+Los chats archivados siguen siendo accesibles arriba de la lista de chats o a través de la búsqueda.</p>
   </li>
   <li>
     <p>Cuando un chat archivado recibe un nuevo mensaje, a menos que esté silenciado, <strong>saldrá del archivo</strong> y volverá a aparecer en tu lista de chats.
@@ -367,18 +374,22 @@ and others will as well not always see that you are “online”.</p>
 <ul>
   <li>
     <p><strong>One tick</strong> <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick1.png" alt="" />
-means that the message was sent successfully to the <a href="#relays">relay</a>.</p>
+means that the message was sent successfully to your provider.</p>
   </li>
   <li>
     <p><strong>Two ticks</strong>  <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick2.png" alt="" />
-indicate your contact has read the message.</p>
+mean that at least one recipient’s device
+reported back to having received the message.</p>
+  </li>
+  <li>
+    <p>Recipients may have disabled read-receipts,
+so even if you see only one tick, the message may have been read.</p>
+  </li>
+  <li>
+    <p>The other way round, two ticks do not automatically mean
+that a human has read or understood the message ;)</p>
   </li>
 </ul>
-
-<p>In <a href="#groups">groups</a> the second tick means that at least one member has reported back having read the message.</p>
-
-<p>You will only get the second tick if both you and one of the recipients who read the message
-has <strong>Settings → Chats → Read Receipts</strong> enabled.</p>
     
       <h3 id="edit">
         
@@ -448,13 +459,14 @@ the (anyway encrypted) messages may take longer to get deleted from their server
         
       </h3>
 
-<p>If you want to save storage on your device, you can choose to delete old
-messages automatically.</p>
-
-<p>To turn it on, go to <strong>Settings → Chats → Delete Message from Device</strong>.
-You can set a timeframe between “after an hour” and “after a year”;
+<ul>
+  <li>If you want to save storage on your device, you can choose to delete old
+messages automatically.</li>
+  <li>To turn it on, go to “delete old messages from device” in the “Chats &amp; Media”
+settings. You can set a timeframe between “after an hour” and “after a year”;
 this way, <em>all</em> messages will be deleted from your device as soon as they are
-older than that.</p>
+older than that.</li>
+</ul>
     
       <h3 id="remove-account">
         
@@ -502,15 +514,9 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
       </h3>
 
 <ul>
-  <li>
-    <p>Selecciona <strong>Nuevo chat</strong> y luego <strong>Nuevo grupo</strong> del menu en el sector superior derecho o toca en el botón correspondiente en Android/iOS.</p>
-  </li>
-  <li>
-    <p>En la siguiente pantalla selecciona a los <strong>miembros del grupo</strong> y define un <strong>nombre de grupo</strong>. Tambien puedes seleccionar un <strong>avatar de grupo</strong>.</p>
-  </li>
-  <li>
-    <p>Tan pronto escribas el <strong>primer mensaje</strong> en el grupo, todos los miembros serán informados sobre el nuevo grupo y podrán responder en él (mientras no escribas un mensaje será invisible para los miembros).</p>
-  </li>
+  <li>Selecciona <strong>Nuevo chat</strong> y luego <strong>Nuevo grupo</strong> del menu en el sector superior derecho o toca en el botón correspondiente en Android/iOS.</li>
+  <li>En la siguiente pantalla selecciona a los <strong>miembros del grupo</strong> y define un <strong>nombre de grupo</strong>. Tambien puedes seleccionar un <strong>avatar de grupo</strong>.</li>
+  <li>Tan pronto escribas el <strong>primer mensaje</strong> en el grupo, todos los miembros serán informados sobre el nuevo grupo y podrán responder en él (mientras no escribas un mensaje será invisible para los miembros).</li>
 </ul>
     
       <h3 id="addmembers">
@@ -521,10 +527,11 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
         
       </h3>
 
-<p>All group members have the <strong>same rights</strong>.
-For this reason, everyone can delete any member or add new ones.</p>
-
 <ul>
+  <li>
+    <p>All group members have the <strong>same rights</strong>.
+For this reason, everyone can delete any member or add new ones.</p>
+  </li>
   <li>
     <p>To <strong>add or delete members</strong>, tap the group name in the chat and select the member to add or remove.</p>
   </li>
@@ -552,8 +559,10 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
         
       </h3>
 
-<p>Como ya no eres miembro del grupo, no puedes volver a agregarte.
-Sin embargo, no hay problema, solo pídale a cualquier otro miembro del grupo en un chat normal que lo vuelva a agregar.</p>
+<ul>
+  <li>Como ya no eres miembro del grupo, no puedes volver a agregarte.
+Sin embargo, no hay problema, solo pídale a cualquier otro miembro del grupo en un chat normal que lo vuelva a agregar.</li>
+</ul>
     
       <h3 id="no-quiero-recibir-más-los-mensajes-de-un-grupo">
         
@@ -564,12 +573,15 @@ Sin embargo, no hay problema, solo pídale a cualquier otro miembro del grupo en
       </h3>
 
 <ul>
-  <li>Elimínate de la lista de miembros o elimina todo el chat.
-Si desea unirse al grupo nuevamente más tarde, pídale a otro miembro del grupo que lo agregue nuevamente.</li>
-</ul>
-
-<p>Como alternativa, también puede “silenciar” a un grupo, lo que significa que recibirá todos los mensajes y
+  <li>
+    <p>Elimínate de la lista de miembros o elimina todo el chat.
+Si desea unirse al grupo nuevamente más tarde, pídale a otro miembro del grupo que lo agregue nuevamente.</p>
+  </li>
+  <li>
+    <p>Como alternativa, también puede “silenciar” a un grupo, lo que significa que recibirá todos los mensajes y
 aún puede escribir, pero ya no se le notifican nuevos mensajes.</p>
+  </li>
+</ul>
     
       <h3 id="cloning-a-group">
         
@@ -595,21 +607,6 @@ or right-click the group in the chat list (Desktop).</p>
 <p>The new group is <strong>fully independent</strong> from the original,
 which continues to work as before.</p>
     
-      <h3 id="how-many-members-can-participate-in-a-single-group">
-        
-        
-          How many members can participate in a single group? <a href="#how-many-members-can-participate-in-a-single-group" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>There is no strict technical limit,
-but more than 150 is not recommended.</p>
-
-<p>As groups get larger, they can become socially unstable and may need a hierarchy -
-where Delta Chat is a private messenger for chatting with <a href="#groups">equal rights</a>.
-See <a href="https://en.wikipedia.org/wiki/Dunbar%27s_number">Dunbar’s number</a> for more insights.</p>
-    
       <h2 id="webxdc">
         
         
@@ -651,7 +648,7 @@ This makes Delta Chat a truly extensible messenger.</p>
     <p>In-chat apps can not send data to the Internet, or download anything.</p>
   </li>
   <li>
-    <p>An in-chat app can only exchange data within a chat, with its
+    <p>An in-chat app can only exchange data within a Delta Chat chat, with its
 copies on the devices of your chat partners. Other than that, it’s completely
 isolated from the Internet.</p>
   </li>
@@ -898,7 +895,7 @@ No es necesario un dispositivo para que el otro funcione.</p>
     <p>Vuelve a verificar que ambos dispositivos estén en la <strong>misma Wi-Fi o red</strong></p>
   </li>
   <li>
-    <p>On <strong>Windows</strong>, go to “Control Panel / Network and Internet”
+    <p>On <strong>Windows</strong>, go to <strong>Control Panel / Network and Internet</strong>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
@@ -950,21 +947,22 @@ try the <strong>manual transfer</strong> described below</p>
 <p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
-  <li>
-    <p>On the old device, go to <strong>Settings → Chats → Export Backup</strong>. Enter your
+  <li>On the old device, go to “Settings -&gt; Chats and media -&gt; Export Backup”. Enter your
 screen unlock PIN, pattern, or password. Then you can click on “Start
 Backup”. This saves the backup file to your device. Now you have to transfer
-it to the other device somehow.</p>
-  </li>
-  <li>
-    <p>On the new device, select <strong>I Already Have a Profile → Restore from Backup</strong>.
-If you use iOS and encounter difficulties,
-<a href="https://support.delta.chat/t/import-backup-to-ios/1628">this guide</a> might help you.</p>
+it to the other device somehow.</li>
+  <li>On the new device, in the “I already have a profile” menu,
+choose “restore from backup”. After import, your conversations, encryption
+keys, and media should be copied to the new device.
+    <ul>
+      <li><strong>If you use iOS:</strong> and you encounter difficulties, maybe
+<a href="https://support.delta.chat/t/import-backup-to-ios/1628">this guide</a> will
+help you.</li>
+    </ul>
   </li>
+  <li>You are now synchronized, and can use both devices for sending and receiving
+end-to-end encrypted messages with your communication partners.</li>
 </ul>
-
-<p>You are now synchronized, and can use both devices for sending and receiving
-end-to-end encrypted messages with your communication partners.</p>
     
       <h3 id="tienen-planeado-crear-un-cliente-web-de-delta-chat">
         
@@ -993,10 +991,10 @@ o el AppImage para Linux. Puedes encontrarlos en
         
       </h2>
     
-      <h3 id="experiments">
+      <h3 id="experimental-features">
         
         
-          Experimental Features <a href="#experiments" class="anchor"></a>
+          Experimental Features <a href="#experimental-features" class="anchor"></a>
         
         
       </h3>
@@ -1009,44 +1007,33 @@ you can try out features we are working on.</p>
 <p>You can find more information
 and give feedback in the <a href="https://support.delta.chat">Forum</a>.</p>
     
-      <h3 id="relays">
+      <h3 id="statssending">
         
         
-          What are Relays? <a href="#relays" class="anchor"></a>
+          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
         
         
       </h3>
 
-<p>Relays are used to temporarily hold messages in case your device is offline.
-Relays are cheap and dumb servers,
-that do not store data as group states, your name or avatar -
-all that exist only on your device.
-Relays are operated by different groups and people.</p>
+<p>We would like to improve Delta Chat with your help,
+which is why Delta Chat for Android asks whether you want
+to send anonymous usage statistics.</p>
 
-<p>By default, after installation, a relay is <strong>automatically set up</strong>,
-so you do not need to care about that.
-However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+<p>You can turn it on and off at
+<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
+
+<p>When you turn it on,
+weekly statistics will be automatically sent to a bot.</p>
+
+<p>We are interested e.g. in statistics like:</p>
 
 <ul>
-  <li>
-    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
-  </li>
-  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
-  </li>
-  <li>
-    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
-  </li>
+  <li>How many contacts are introduced by personally scanning a QR code?</li>
+  <li>Which versions of Delta Chat are being used?</li>
+  <li>How many messages are unencrypted?</li>
 </ul>
 
-<p>For more details and future possibilities of relays,
-you can follow discussions in the <a href="https://support.delta.chat">Forum</a>.</p>
+<p>We will <em>not</em> collect any personally identifiable information about you.</p>
     
       <h3 id="can-i-use-a-classic-email-address-with-delta-chat">
         
@@ -1068,7 +1055,7 @@ while chatmail apps and relays pervasively enforce end-to-end encryption and sec
   </li>
   <li>
     <p>Non-chatmail apps use email servers as a long-term message archive
-while chatmail clients use email servers for ephemeral instant message relay.</p>
+while chatmail clients use email servers for ephemeral instant message transport.</p>
   </li>
   <li>
     <p>Supporting the full variety of classic email setups
@@ -1080,7 +1067,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
       <h3 id="classic-email">
         
         
-          How can I configure a chat profile with a classic email address as relay? <a href="#classic-email" class="anchor"></a>
+          How can I configure a chat profile with a classic email address as transport? <a href="#classic-email" class="anchor"></a>
         
         
       </h3>
@@ -1089,7 +1076,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
 unless you are prepared to deal with encrypted messages in the inbox,
 double notifications, accidentally deleted emails or similar annoyances.</p>
 
-<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Relay</strong>.
+<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Transport</strong>.
 Note that classic email providers will generally not support <a href="#instant-delivery">Push Notifications</a>
 and have other limitations, see <a href="https://providers.delta.chat">Provider Overview</a>.
 Chatmail uses the default INBOX for relay; ensure the provider setup does too. 
@@ -1113,40 +1100,6 @@ except if your users’ devices require Google/Apple <a href="#instant-delivery"
 and <a href="https://github.com/chatmail/core">core Rust developments</a> 
 that power <a href="https://chatmail.at/clients">chatmail clients</a> of which Delta Chat is the most well known.</p>
     
-      <h3 id="statssending">
-        
-        
-          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>We would like to improve Delta Chat with your help,
-which is why Delta Chat for Android asks whether you want
-to send anonymous usage statistics.</p>
-
-<p>You can turn it on and off at
-<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
-
-<p>When you turn it on,
-weekly statistics will be automatically sent to a bot.</p>
-
-<p>We are interested e.g. in statistics like:</p>
-
-<ul>
-  <li>
-    <p>How many contacts are introduced by personally scanning a QR code?</p>
-  </li>
-  <li>
-    <p>Which versions of Delta Chat are being used?</p>
-  </li>
-  <li>
-    <p>What errors occur for users?</p>
-  </li>
-</ul>
-
-<p>We will <em>not</em> collect any personally identifiable information about you.</p>
-    
       <h3 id="estoy-interesado-en-los-detalles-técnicos-pueden-decirme-más">
         
         
@@ -1155,7 +1108,9 @@ weekly statistics will be automatically sent to a bot.</p>
         
       </h3>
 
-<p>Visita la página <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Estándares usados en Delta Chat</a>.</p>
+<ul>
+  <li>Visita la página <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Estándares usados en Delta Chat</a>.</li>
+</ul>
     
       <h2 id="e2ee">
         
@@ -1391,32 +1346,6 @@ with the knowledge that all their data, along with all metadata, will be deleted
 Moreover, if a device is seized then chat contacts using short-lived profiles
 can not be identified easily.</p>
     
-      <h3 id="who-sees-my-ip-address">
-        
-        
-          Who sees my IP Address? <a href="#who-sees-my-ip-address" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>The used <a href="#relays">relay</a> needs to know your IP Address,
-as well as sometimes your contact’s devices if you have a <a href="#experiments">call</a>
-or use <a href="#webxdc">apps</a> together.</p>
-
-<p>IP Addresses are needed for connectivity and efficiency.
-They are neither persisted nor exposed.
-Note that the IP Address
-is not like a detailed address you give to a delivery service,
-but much more coarse, often defining region or country only.</p>
-
-<p>As this is just how the internet and other messengers work by default,
-we do not offer options here or ask upfront questions.</p>
-
-<p>If you see your IP Address as a security or privacy risk,
-we recommend to use a VPN, in combination with system lockdown mode.
-Hunting down options in all apps on your system will leave gaps.
-For example, tapping a link exposes IP Addresses to unknown parties and is the by far larger risk here.</p>
-    
       <h3 id="sealedsender">
         
         
@@ -1499,12 +1428,12 @@ in collaboration with other OpenPGP implementers.</p>
 
 <p>No.</p>
 
-<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1.
-We do not recommend or offer users to perform manual key management.
-We want to ensure that security audits can focus on a few proven cryptographic algorithms
-instead of the full breadth of possible algorithms allowed with OpenPGP.
-If you want to extract your OpenPGP key, there only is an expert method:
-you need to look it up in the “keypairs” SQLite table of a profile backup tar-file.</p>
+<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1. 
+You can export your private key but you can not import additional private keys.</p>
+
+<p>In general, we do not recommend or offer users to perform manual key management. 
+We want to ensure that security audits can focus on a few proven cryptographic algorithms 
+instead of the full breadth of possible algorithms allowed with OpenPGP.</p>
     
       <h3 id="security-audits">
         
@@ -1652,38 +1581,52 @@ ordered chronologically:</p>
 
 <ul>
   <li>
-    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
-program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
-along with collaboration partners working on
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>,
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>,
-<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and
-<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>.
-All of these projects are partially completed or to be completed in early 2025.</p>
+    <p>El proyecto de la UE <a href="https://nextleap.eu">NEXTLEAP</a> financió la investigación
+e implementación de grupos verificados y protocolos de contacto
+en 2017 y 2018 y también ayudó a integrar el cifrado de extremo a extremo
+a través de <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p>In 2021 we received further EU funding for two Next-Generation-Internet
-proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a 
+first 2018/2019 grant (~$200K) during which we majorly improved the Android app 
+and released a first Desktop app beta version, and which moreover 
+moored our feature developments in UX research in human rights contexts, 
+see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
+The second 2019/2020 grant (~$300K) helped us to 
+release Delta/iOS versions, to convert our core library to Rust, and
+to provide new features for all platforms.</p>
   </li>
   <li>
     <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
 completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
   </li>
   <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p>In 2021 we received further EU funding for two Next-Generation-Internet
+proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
   </li>
   <li>
-    <p>El proyecto de la UE <a href="https://nextleap.eu">NEXTLEAP</a> financió la investigación
-e implementación de grupos verificados y protocolos de contacto
-en 2017 y 2018 y también ayudó a integrar el cifrado de extremo a extremo
-a través de <a href="https://autocrypt.org">Autocrypt</a>.</p>
+    <p>From End 2021 till March 2023 we received <em>Internet Freedom</em> funding (500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supported our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of email servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
+  </li>
+  <li>
+    <p>2023-2024 we successfully completed the OTF-funded 
+<a href="https://www.opentech.fund/projects-we-support/supported-projects/secure-chat-mail-with-delta-chat/">Secure Chatmail project</a>, 
+allowing us to introduce guaranteed encryption, 
+creating a <a href="https://delta.chat/chatmail">chatmail server network</a> 
+and providing “instant onboarding” in all apps released from April 2024 on.</p>
+  </li>
+  <li>
+    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
+program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
+along with collaboration partners working on 
+<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>, 
+<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>, 
+<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and 
+<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>. 
+All of these projects are partially completed or to be completed in early 2025.</p>
   </li>
   <li>
     <p>Sometimes we receive one-time donations from private individuals. 

src/main/assets/help/fr/help.html

@@ -26,7 +26,6 @@
       <li><a href="#jai-quitté-un-groupe-par-accident">J’ai quitté un groupe par accident.</a></li>
       <li><a href="#je-ne-souhaite-plus-recevoir-les-messages-dun-groupe">Je ne souhaite plus recevoir les messages d’un groupe.</a></li>
       <li><a href="#cloning-a-group">Cloning a group</a></li>
-      <li><a href="#how-many-members-can-participate-in-a-single-group">How many members can participate in a single group?</a></li>
     </ul>
   </li>
   <li><a href="#webxdc">In-chat apps</a>
@@ -55,12 +54,11 @@
   </li>
   <li><a href="#advanced">Advanced</a>
     <ul>
-      <li><a href="#experiments">Experimental Features</a></li>
-      <li><a href="#relays">What are Relays?</a></li>
-      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
-      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as relay?</a></li>
-      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
+      <li><a href="#experimental-features">Experimental Features</a></li>
       <li><a href="#statssending">What is “Send statistics to Delta Chat’s developers”?</a></li>
+      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
+      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as transport?</a></li>
+      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
       <li><a href="#les-détails-techniques-mintéressent-pouvez-vous-men-dire-plus-">Les détails techniques m’intéressent. Pouvez-vous m’en dire plus ?</a></li>
     </ul>
   </li>
@@ -77,7 +75,6 @@
       <li><a href="#tls">Are messages marked with the mail icon exposed on the Internet?</a></li>
       <li><a href="#message-metadata">How does Delta Chat protect metadata in messages?</a></li>
       <li><a href="#device-seizure">How to protect metadata and contacts when a device is seized?</a></li>
-      <li><a href="#who-sees-my-ip-address">Who sees my IP Address?</a></li>
       <li><a href="#sealedsender">Does Delta Chat support “Sealed Sender”?</a></li>
       <li><a href="#pfs">Does Delta Chat support Perfect Forward Secrecy?</a></li>
       <li><a href="#pqc">Does Delta Chat support Post-Quantum-Cryptography?</a></li>
@@ -187,8 +184,7 @@ If you add each other to <a href="#groups">groups</a>, end-to-end encryption wil
 <p>As being a private messenger,
 only friends and family you <a href="#howtoe2ee">share your QR code or invite link with</a> can write to you.</p>
 
-<p>Your friends may share your contact with other friends,
-this appears as <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Request</b></p>
+<p>Your friends may share your contact with other friends, this appears as a <strong>request</strong>.</p>
 
 <ul>
   <li>
@@ -226,10 +222,15 @@ and can tap it to start chatting with the first contact.</p>
         
       </h3>
 
-<p>Oui. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
+<ul>
+  <li>
+    <p>Oui. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
 or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>Pour améliorer les performances, les images sont redimensionnées et envoyées en taille réduite par défaut ; mais vous pouvez les envoyer en tant que “fichier” pour en conserver la taille originale.</p>
+  </li>
+  <li>
+    <p>Pour améliorer les performances, les images sont redimensionnées et envoyées en taille réduite par défaut ; mais vous pouvez les envoyer en tant que “fichier” pour en conserver la taille originale.</p>
+  </li>
+</ul>
     
       <h3 id="multiple-accounts">
         
@@ -262,7 +263,9 @@ or to <strong>Switch Profiles</strong>.</p>
 
 <p>Dans les paramètres vous pouvez ajouter une photo de profil. Si vous écrivez à vos contacts ou que vous les ajoutez via le QR code, ils la verront automatiquement comme votre photo de profil.</p>
 
-<p>Pour des raisons de confidentialité, personne ne peut voir votre photo de profil sans que vous ayez d’abord entamé une discussion.</p>
+<ul>
+  <li>Pour des raisons de confidentialité, personne ne peut voir votre photo de profil sans que vous ayez d’abord entamé une discussion.</li>
+</ul>
     
       <h3 id="signature">
         
@@ -295,7 +298,8 @@ they will see it when they view your contact details.</p>
     <p>Utilisez la <strong>sourdine</strong> pour les discussions dont vous ne voulez pas recevoir les notifications. Les discussions en sourdine figurent toujours dans votre liste et peuvent aussi être les épinglées.</p>
   </li>
   <li>
-    <p><strong>Archivez les discussions</strong> si vous ne voulez plus les voir apparaître dans votre liste de discussions.  Les discussions archivées restent accessibles au-dessus de la liste de discussions ou via la recherche.</p>
+    <p><strong>Archivez les discussions</strong> si vous ne voulez plus les voir apparaître dans votre liste de discussions.
+Les discussions archivées restent accessibles au-dessus de la liste de discussions ou via la recherche.</p>
   </li>
   <li>
     <p>Lorsqu’un nouveau message est envoyé sur une discussion que vous avez archivée, et que vous n’avez pas mise en sourdine, la discussion <strong>sort des archives</strong> et reprend sa place dans votre liste de discussions.
@@ -331,7 +335,7 @@ By tapping <img style="vertical-align:middle; width:1.2em; margin:1px" src="../g
 you can go back to the original message in the original chat</p>
   </li>
   <li>
-    <p>Finally, you can also use “Saved Messages” to take <strong>personal notes</strong> - open the chat, type something, add a photo or a voice message etc.</p>
+    <p>Finally, you can also use “Save Messages” to take <strong>personal notes</strong> - open the chat, type something, add a photo or a voice message etc.</p>
   </li>
   <li>
     <p>As “Saved Message” are synced, they can become very handy for transferring data between devices</p>
@@ -368,18 +372,22 @@ and others will as well not always see that you are “online”.</p>
 <ul>
   <li>
     <p><strong>One tick</strong> <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick1.png" alt="" />
-means that the message was sent successfully to the <a href="#relays">relay</a>.</p>
+means that the message was sent successfully to your provider.</p>
   </li>
   <li>
     <p><strong>Two ticks</strong>  <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick2.png" alt="" />
-indicate your contact has read the message.</p>
+mean that at least one recipient’s device
+reported back to having received the message.</p>
+  </li>
+  <li>
+    <p>Recipients may have disabled read-receipts,
+so even if you see only one tick, the message may have been read.</p>
+  </li>
+  <li>
+    <p>The other way round, two ticks do not automatically mean
+that a human has read or understood the message ;)</p>
   </li>
 </ul>
-
-<p>In <a href="#groups">groups</a> the second tick means that at least one member has reported back having read the message.</p>
-
-<p>You will only get the second tick if both you and one of the recipients who read the message
-has <strong>Settings → Chats → Read Receipts</strong> enabled.</p>
     
       <h3 id="edit">
         
@@ -449,9 +457,10 @@ the (anyway encrypted) messages may take longer to get deleted from their server
         
       </h3>
 
-<p>Vous pouvez choisir de supprimer automatiquement les anciens messages pour libérer de l’espace de stockage sur votre appareil.</p>
-
-<p>Pour activer cette option, ouvrez les paramètres des “Discussions et fichiers multimédias” et cliquez sur “Supprimer les anciens messages de l’appareil”. Vous pouvez définir le délai après lequel <em>tous</em> les messages seront supprimés de votre appareil, parmi plusieurs choix allant de “Immédiatement” à “Après 1 année”.</p>
+<ul>
+  <li>Vous pouvez choisir de supprimer automatiquement les anciens messages pour libérer de l’espace de stockage sur votre appareil.</li>
+  <li>Pour activer cette option, ouvrez les paramètres des “Discussions et fichiers multimédias” et cliquez sur “Supprimer les anciens messages de l’appareil”. Vous pouvez définir le délai après lequel <em>tous</em> les messages seront supprimés de votre appareil, parmi plusieurs choix allant de “Immédiatement” à “Après 1 année”.</li>
+</ul>
     
       <h3 id="remove-account">
         
@@ -499,15 +508,9 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
       </h3>
 
 <ul>
-  <li>
-    <p>Sélectionnez <strong>Nouvelle discussion</strong> puis <strong>Nouveau groupe</strong> dans le menu à trois points situé en haut à droite de la fenêtre ou son équivalent sous Android et iOS.</p>
-  </li>
-  <li>
-    <p>Sur l’écran suivant, sélectionnez <strong>Ajouter des participants</strong> et choisissez un <strong>Nom du groupe</strong>. Vous pouvez aussi choisir une <strong>image de groupe</strong>.</p>
-  </li>
-  <li>
-    <p>Lorsque vous enverrez le <strong>premier message</strong> dans le groupe, tous les membres en seront informés et pourront répondre. Le groupe est invisible aux autres membres si vous n’écrivez pas de premier message.</p>
-  </li>
+  <li>Sélectionnez <strong>Nouvelle discussion</strong> puis <strong>Nouveau groupe</strong> dans le menu à trois points situé en haut à droite de la fenêtre ou son équivalent sous Android et iOS.</li>
+  <li>Sur l’écran suivant, sélectionnez <strong>Ajouter des participants</strong> et choisissez un <strong>Nom du groupe</strong>. Vous pouvez aussi choisir une <strong>image de groupe</strong>.</li>
+  <li>Lorsque vous enverrez le <strong>premier message</strong> dans le groupe, tous les membres en seront informés et pourront répondre. Le groupe est invisible aux autres membres si vous n’écrivez pas de premier message.</li>
 </ul>
     
       <h3 id="addmembers">
@@ -518,10 +521,11 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
         
       </h3>
 
-<p>All group members have the <strong>same rights</strong>.
-For this reason, everyone can delete any member or add new ones.</p>
-
 <ul>
+  <li>
+    <p>All group members have the <strong>same rights</strong>.
+For this reason, everyone can delete any member or add new ones.</p>
+  </li>
   <li>
     <p>To <strong>add or delete members</strong>, tap the group name in the chat and select the member to add or remove.</p>
   </li>
@@ -549,8 +553,10 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
         
       </h3>
 
-<p>Comme vous n’êtes plus membre du groupe, vous ne pouvez pas vous y ajouter vous-même. 
-Contactez n’importe quel autre membre de ce groupe dans une discussion directe pour lui demander de vous y ré-inviter.</p>
+<ul>
+  <li>Comme vous n’êtes plus membre du groupe, vous ne pouvez pas vous y ajouter vous-même. 
+Contactez n’importe quel autre membre de ce groupe dans une discussion directe pour lui demander de vous y ré-inviter.</li>
+</ul>
     
       <h3 id="je-ne-souhaite-plus-recevoir-les-messages-dun-groupe">
         
@@ -561,11 +567,14 @@ Contactez n’importe quel autre membre de ce groupe dans une discussion directe
       </h3>
 
 <ul>
-  <li>Supprimez-vous de la liste des membres ou supprimez la discussion entière. 
-Si souhaitez rejoindre le groupe plus tard, demandez à un autre membre du groupe de vous ré-inviter.</li>
+  <li>
+    <p>Supprimez-vous de la liste des membres ou supprimez la discussion entière. 
+Si souhaitez rejoindre le groupe plus tard, demandez à un autre membre du groupe de vous ré-inviter.</p>
+  </li>
+  <li>
+    <p>Vous pouvez également mettre un groupe en “Sourdine” : vous recevrez tous les messages et pourrez toujours écrire, mais n’aurez plus les notifications des nouveaux messages.</p>
+  </li>
 </ul>
-
-<p>Vous pouvez également mettre un groupe en “Sourdine” : vous recevrez tous les messages et pourrez toujours écrire, mais n’aurez plus les notifications des nouveaux messages.</p>
     
       <h3 id="cloning-a-group">
         
@@ -591,21 +600,6 @@ or right-click the group in the chat list (Desktop).</p>
 <p>The new group is <strong>fully independent</strong> from the original,
 which continues to work as before.</p>
     
-      <h3 id="how-many-members-can-participate-in-a-single-group">
-        
-        
-          How many members can participate in a single group? <a href="#how-many-members-can-participate-in-a-single-group" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>There is no strict technical limit,
-but more than 150 is not recommended.</p>
-
-<p>As groups get larger, they can become socially unstable and may need a hierarchy -
-where Delta Chat is a private messenger for chatting with <a href="#groups">equal rights</a>.
-See <a href="https://en.wikipedia.org/wiki/Dunbar%27s_number">Dunbar’s number</a> for more insights.</p>
-    
       <h2 id="webxdc">
         
         
@@ -647,7 +641,7 @@ This makes Delta Chat a truly extensible messenger.</p>
     <p>In-chat apps can not send data to the Internet, or download anything.</p>
   </li>
   <li>
-    <p>An in-chat app can only exchange data within a chat, with its
+    <p>An in-chat app can only exchange data within a Delta Chat chat, with its
 copies on the devices of your chat partners. Other than that, it’s completely
 isolated from the Internet.</p>
   </li>
@@ -892,7 +886,7 @@ L’un n’a pas besoin de l’autre pour pouvoir fonctionner.</p>
     <p>Vérifier à nouveau que les deux appareils sont sur <strong>le même réseau ou le même Wi-Fi</strong>.</p>
   </li>
   <li>
-    <p>On <strong>Windows</strong>, go to “Control Panel / Network and Internet”
+    <p>On <strong>Windows</strong>, go to <strong>Control Panel / Network and Internet</strong>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
@@ -943,21 +937,22 @@ Vous pouvez utiliser plusieurs comptes par appareil : <a href="#multiple-account
 <p>Recourez à cette méthode uniquement si les instructions ci-dessus pour “Ajouter un deuxième appareil” ont échoué.</p>
 
 <ul>
-  <li>
-    <p>On the old device, go to <strong>Settings → Chats → Export Backup</strong>. Enter your
+  <li>On the old device, go to “Settings -&gt; Chats and media -&gt; Export Backup”. Enter your
 screen unlock PIN, pattern, or password. Then you can click on “Start
 Backup”. This saves the backup file to your device. Now you have to transfer
-it to the other device somehow.</p>
-  </li>
-  <li>
-    <p>On the new device, select <strong>I Already Have a Profile → Restore from Backup</strong>.
-If you use iOS and encounter difficulties,
-<a href="https://support.delta.chat/t/import-backup-to-ios/1628">this guide</a> might help you.</p>
+it to the other device somehow.</li>
+  <li>On the new device, in the “I already have a profile” menu,
+choose “restore from backup”. After import, your conversations, encryption
+keys, and media should be copied to the new device.
+    <ul>
+      <li><strong>If you use iOS:</strong> and you encounter difficulties, maybe
+<a href="https://support.delta.chat/t/import-backup-to-ios/1628">this guide</a> will
+help you.</li>
+    </ul>
   </li>
+  <li>You are now synchronized, and can use both devices for sending and receiving
+end-to-end encrypted messages with your communication partners.</li>
 </ul>
-
-<p>You are now synchronized, and can use both devices for sending and receiving
-end-to-end encrypted messages with your communication partners.</p>
     
       <h3 id="le-lancement-dun-client-web-delta-chat-est-il-prévu-">
         
@@ -983,10 +978,10 @@ end-to-end encrypted messages with your communication partners.</p>
         
       </h2>
     
-      <h3 id="experiments">
+      <h3 id="experimental-features">
         
         
-          Experimental Features <a href="#experiments" class="anchor"></a>
+          Experimental Features <a href="#experimental-features" class="anchor"></a>
         
         
       </h3>
@@ -999,44 +994,33 @@ you can try out features we are working on.</p>
 <p>You can find more information
 and give feedback in the <a href="https://support.delta.chat">Forum</a>.</p>
     
-      <h3 id="relays">
+      <h3 id="statssending">
         
         
-          What are Relays? <a href="#relays" class="anchor"></a>
+          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
         
         
       </h3>
 
-<p>Relays are used to temporarily hold messages in case your device is offline.
-Relays are cheap and dumb servers,
-that do not store data as group states, your name or avatar -
-all that exist only on your device.
-Relays are operated by different groups and people.</p>
+<p>We would like to improve Delta Chat with your help,
+which is why Delta Chat for Android asks whether you want
+to send anonymous usage statistics.</p>
 
-<p>By default, after installation, a relay is <strong>automatically set up</strong>,
-so you do not need to care about that.
-However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+<p>You can turn it on and off at
+<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
+
+<p>When you turn it on,
+weekly statistics will be automatically sent to a bot.</p>
+
+<p>We are interested e.g. in statistics like:</p>
 
 <ul>
-  <li>
-    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
-  </li>
-  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
-  </li>
-  <li>
-    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
-  </li>
+  <li>How many contacts are introduced by personally scanning a QR code?</li>
+  <li>Which versions of Delta Chat are being used?</li>
+  <li>How many messages are unencrypted?</li>
 </ul>
 
-<p>For more details and future possibilities of relays,
-you can follow discussions in the <a href="https://support.delta.chat">Forum</a>.</p>
+<p>We will <em>not</em> collect any personally identifiable information about you.</p>
     
       <h3 id="can-i-use-a-classic-email-address-with-delta-chat">
         
@@ -1058,7 +1042,7 @@ while chatmail apps and relays pervasively enforce end-to-end encryption and sec
   </li>
   <li>
     <p>Non-chatmail apps use email servers as a long-term message archive
-while chatmail clients use email servers for ephemeral instant message relay.</p>
+while chatmail clients use email servers for ephemeral instant message transport.</p>
   </li>
   <li>
     <p>Supporting the full variety of classic email setups
@@ -1070,7 +1054,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
       <h3 id="classic-email">
         
         
-          How can I configure a chat profile with a classic email address as relay? <a href="#classic-email" class="anchor"></a>
+          How can I configure a chat profile with a classic email address as transport? <a href="#classic-email" class="anchor"></a>
         
         
       </h3>
@@ -1079,7 +1063,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
 unless you are prepared to deal with encrypted messages in the inbox,
 double notifications, accidentally deleted emails or similar annoyances.</p>
 
-<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Relay</strong>.
+<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Transport</strong>.
 Note that classic email providers will generally not support <a href="#instant-delivery">Push Notifications</a>
 and have other limitations, see <a href="https://providers.delta.chat">Provider Overview</a>.
 Chatmail uses the default INBOX for relay; ensure the provider setup does too. 
@@ -1103,40 +1087,6 @@ except if your users’ devices require Google/Apple <a href="#instant-delivery"
 and <a href="https://github.com/chatmail/core">core Rust developments</a> 
 that power <a href="https://chatmail.at/clients">chatmail clients</a> of which Delta Chat is the most well known.</p>
     
-      <h3 id="statssending">
-        
-        
-          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>We would like to improve Delta Chat with your help,
-which is why Delta Chat for Android asks whether you want
-to send anonymous usage statistics.</p>
-
-<p>You can turn it on and off at
-<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
-
-<p>When you turn it on,
-weekly statistics will be automatically sent to a bot.</p>
-
-<p>We are interested e.g. in statistics like:</p>
-
-<ul>
-  <li>
-    <p>How many contacts are introduced by personally scanning a QR code?</p>
-  </li>
-  <li>
-    <p>Which versions of Delta Chat are being used?</p>
-  </li>
-  <li>
-    <p>What errors occur for users?</p>
-  </li>
-</ul>
-
-<p>We will <em>not</em> collect any personally identifiable information about you.</p>
-    
       <h3 id="les-détails-techniques-mintéressent-pouvez-vous-men-dire-plus-">
         
         
@@ -1145,7 +1095,9 @@ weekly statistics will be automatically sent to a bot.</p>
         
       </h3>
 
-<p>Consultez les <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">standards utilisés dans Delta Chat</a>.</p>
+<ul>
+  <li>Consultez les <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">standards utilisés dans Delta Chat</a>.</li>
+</ul>
     
       <h2 id="e2ee">
         
@@ -1384,32 +1336,6 @@ with the knowledge that all their data, along with all metadata, will be deleted
 Moreover, if a device is seized then chat contacts using short-lived profiles
 can not be identified easily.</p>
     
-      <h3 id="who-sees-my-ip-address">
-        
-        
-          Who sees my IP Address? <a href="#who-sees-my-ip-address" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>The used <a href="#relays">relay</a> needs to know your IP Address,
-as well as sometimes your contact’s devices if you have a <a href="#experiments">call</a>
-or use <a href="#webxdc">apps</a> together.</p>
-
-<p>IP Addresses are needed for connectivity and efficiency.
-They are neither persisted nor exposed.
-Note that the IP Address
-is not like a detailed address you give to a delivery service,
-but much more coarse, often defining region or country only.</p>
-
-<p>As this is just how the internet and other messengers work by default,
-we do not offer options here or ask upfront questions.</p>
-
-<p>If you see your IP Address as a security or privacy risk,
-we recommend to use a VPN, in combination with system lockdown mode.
-Hunting down options in all apps on your system will leave gaps.
-For example, tapping a link exposes IP Addresses to unknown parties and is the by far larger risk here.</p>
-    
       <h3 id="sealedsender">
         
         
@@ -1496,12 +1422,12 @@ the connection is safe.</p>
 
 <p>No.</p>
 
-<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1.
-We do not recommend or offer users to perform manual key management.
-We want to ensure that security audits can focus on a few proven cryptographic algorithms
-instead of the full breadth of possible algorithms allowed with OpenPGP.
-If you want to extract your OpenPGP key, there only is an expert method:
-you need to look it up in the “keypairs” SQLite table of a profile backup tar-file.</p>
+<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1. 
+You can export your private key but you can not import additional private keys.</p>
+
+<p>In general, we do not recommend or offer users to perform manual key management. 
+We want to ensure that security audits can focus on a few proven cryptographic algorithms 
+instead of the full breadth of possible algorithms allowed with OpenPGP.</p>
     
       <h3 id="security-audits">
         
@@ -1628,38 +1554,47 @@ ordered chronologically:</p>
 
 <ul>
   <li>
-    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
-program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
-along with collaboration partners working on
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>,
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>,
-<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and
-<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>.
-All of these projects are partially completed or to be completed in early 2025.</p>
+    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
+and implementation of verified groups and setup contact protocols
+in 2017 and 2018 and also helped to integrate end-to-end Encryption
+through <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p>In 2021 we received further EU funding for two Next-Generation-Internet
-proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+    <p>L’association <a href="https://opentechfund.org">Open Technology Fund</a> nous a octroyé une première subvention en 2018/2019 (de 200.000$ environ), grâce à laquelle nous avons pu apporter des améliorations majeures à l’application Android et publier une première version Beta de l’application de bureau. Elle nous a aussi permis d’ancrer notre recherche UX de développement de fonctionnalités dans des contextes de droits humains. <br />
+À ce sujet, vous pouvez consulter notre rapport en anglais <a href="https://delta.chat/en/2019-07-19-uxreport">“Needfinding and UX report”</a>.
+La seconde subvention de 2019/2020 (environ 300.000$) nous a permis de publier des version iOS de Delta Chat, de convertir notre bibliothèque principale en Rust et de créer de nouvelles fonctionnalités pour toutes les plateformes.</p>
   </li>
   <li>
     <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
 completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
   </li>
   <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p>In 2021 we received further EU funding for two Next-Generation-Internet
+proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
   </li>
   <li>
-    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
-and implementation of verified groups and setup contact protocols
-in 2017 and 2018 and also helped to integrate end-to-end Encryption
-through <a href="https://autocrypt.org">Autocrypt</a>.</p>
+    <p>From End 2021 till March 2023 we received <em>Internet Freedom</em> funding (500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supported our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of email servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
+  </li>
+  <li>
+    <p>2023-2024 we successfully completed the OTF-funded 
+<a href="https://www.opentech.fund/projects-we-support/supported-projects/secure-chat-mail-with-delta-chat/">Secure Chatmail project</a>, 
+allowing us to introduce guaranteed encryption, 
+creating a <a href="https://delta.chat/chatmail">chatmail server network</a> 
+and providing “instant onboarding” in all apps released from April 2024 on.</p>
+  </li>
+  <li>
+    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
+program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
+along with collaboration partners working on 
+<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>, 
+<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>, 
+<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and 
+<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>. 
+All of these projects are partially completed or to be completed in early 2025.</p>
   </li>
   <li>
     <p>Nous recevons parfois des dons ponctuels de la part de personnes privées. 

src/main/assets/help/help.css

@@ -6,10 +6,6 @@ a {
   text-decoration: none;
 }
 
-a[href^='http']::after {
-    content: " ↗";
-}
-
 h2, h3, h4 {
   margin-top: 2rem;
 }

src/main/assets/help/id/help.html

@@ -15,7 +15,7 @@
       <li><a href="#what-do-the-ticks-shown-beside-outgoing-messages-mean">What do the ticks shown beside outgoing messages mean?</a></li>
       <li><a href="#edit">Correct typos and delete messages after sending</a></li>
       <li><a href="#ephemeralmsgs">How do disappearing messages work?</a></li>
-      <li><a href="#delold">What happens if I turn on “Delete Messages from Device”?</a></li>
+      <li><a href="#delold">What happens if I turn on “Delete old messages from device”?</a></li>
       <li><a href="#remove-account">How can I delete my chat profile?</a></li>
     </ul>
   </li>
@@ -26,7 +26,6 @@
       <li><a href="#i-have-deleted-myself-by-accident">I have deleted myself by accident.</a></li>
       <li><a href="#i-do-not-want-to-receive-the-messages-of-a-group-any-longer">I do not want to receive the messages of a group any longer.</a></li>
       <li><a href="#cloning-a-group">Cloning a group</a></li>
-      <li><a href="#how-many-members-can-participate-in-a-single-group">How many members can participate in a single group?</a></li>
     </ul>
   </li>
   <li><a href="#webxdc">In-chat apps</a>
@@ -55,12 +54,11 @@
   </li>
   <li><a href="#advanced">Advanced</a>
     <ul>
-      <li><a href="#experiments">Experimental Features</a></li>
-      <li><a href="#relays">What are Relays?</a></li>
-      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
-      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as relay?</a></li>
-      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
+      <li><a href="#experimental-features">Experimental Features</a></li>
       <li><a href="#statssending">What is “Send statistics to Delta Chat’s developers”?</a></li>
+      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
+      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as transport?</a></li>
+      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
       <li><a href="#im-interested-in-the-technical-details-can-you-tell-me-more">I’m interested in the technical details. Can you tell me more?</a></li>
     </ul>
   </li>
@@ -77,7 +75,6 @@
       <li><a href="#tls">Are messages marked with the mail icon exposed on the Internet?</a></li>
       <li><a href="#message-metadata">How does Delta Chat protect metadata in messages?</a></li>
       <li><a href="#device-seizure">How to protect metadata and contacts when a device is seized?</a></li>
-      <li><a href="#who-sees-my-ip-address">Who sees my IP Address?</a></li>
       <li><a href="#sealedsender">Does Delta Chat support “Sealed Sender”?</a></li>
       <li><a href="#pfs">Does Delta Chat support Perfect Forward Secrecy?</a></li>
       <li><a href="#pqc">Does Delta Chat support Post-Quantum-Cryptography?</a></li>
@@ -187,8 +184,7 @@ If you add each other to <a href="#groups">groups</a>, end-to-end encryption wil
 <p>As being a private messenger,
 only friends and family you <a href="#howtoe2ee">share your QR code or invite link with</a> can write to you.</p>
 
-<p>Your friends may share your contact with other friends,
-this appears as <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Request</b></p>
+<p>Your friends may share your contact with other friends, this appears as a <strong>request</strong>.</p>
 
 <ul>
   <li>
@@ -226,10 +222,15 @@ and can tap it to start chatting with the first contact.</p>
         
       </h3>
 
-<p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
+<ul>
+  <li>
+    <p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
 or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>For performance, images are optimized and sent at a smaller size by default, but you can send it as a “file” to preserve the original.</p>
+  </li>
+  <li>
+    <p>For performance, images are optimized and sent at a smaller size by default, but you can send it as a “file” to preserve the original.</p>
+  </li>
+</ul>
     
       <h3 id="multiple-accounts">
         
@@ -260,11 +261,16 @@ or to <strong>Switch Profiles</strong>.</p>
         
       </h3>
 
-<p>Anda dapat menambahkan gambar profil di pengaturan Anda. Jika Anda menulis ke kontak Anda
-  atau menambahkannya melalui kode QR, mereka secara otomatis melihatnya sebagai gambar profil Anda.</p>
-
-<p>Untuk alasan kerahasiaan, tidak ada satupun yang dapat melihat Foto Profil anda hingga anda menulis
+<ul>
+  <li>
+    <p>Anda dapat menambahkan gambar profil di pengaturan Anda. Jika Anda menulis ke kontak Anda
+atau menambahkannya melalui kode QR, mereka secara otomatis melihatnya sebagai gambar profil Anda.</p>
+  </li>
+  <li>
+    <p>Untuk alasan kerahasiaan, tidak ada satupun yang dapat melihat Foto Profil anda hingga anda menulis
 sebuah pesan kepada mereka.</p>
+  </li>
+</ul>
     
       <h3 id="signature">
         
@@ -298,8 +304,7 @@ they will see it when they view your contact details.</p>
   </li>
   <li>
     <p><strong>Archive chats</strong> if you do not want to see them in your chat list any longer.
-They remain accessible above the chat list or via search
-and are marked by <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Archived</b></p>
+Archived chats remain accessible above the chat list or via search.</p>
   </li>
   <li>
     <p>When an archived chat gets a new message, unless muted, it will <strong>pop out of the archive</strong> and back into your chat list.
@@ -334,7 +339,7 @@ By tapping <img style="vertical-align:middle; width:1.2em; margin:1px" src="../g
 you can go back to the original message in the original chat</p>
   </li>
   <li>
-    <p>Finally, you can also use “Saved Messages” to take <strong>personal notes</strong> - open the chat, type something, add a photo or a voice message etc.</p>
+    <p>Finally, you can also use “Save Messages” to take <strong>personal notes</strong> - open the chat, type something, add a photo or a voice message etc.</p>
   </li>
   <li>
     <p>As “Saved Message” are synced, they can become very handy for transferring data between devices</p>
@@ -371,18 +376,22 @@ and others will as well not always see that you are “online”.</p>
 <ul>
   <li>
     <p><strong>One tick</strong> <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick1.png" alt="" />
-means that the message was sent successfully to the <a href="#relays">relay</a>.</p>
+means that the message was sent successfully to your provider.</p>
   </li>
   <li>
     <p><strong>Two ticks</strong>  <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick2.png" alt="" />
-indicate your contact has read the message.</p>
+mean that at least one recipient’s device
+reported back to having received the message.</p>
+  </li>
+  <li>
+    <p>Recipients may have disabled read-receipts,
+so even if you see only one tick, the message may have been read.</p>
+  </li>
+  <li>
+    <p>The other way round, two ticks do not automatically mean
+that a human has read or understood the message ;)</p>
   </li>
 </ul>
-
-<p>In <a href="#groups">groups</a> the second tick means that at least one member has reported back having read the message.</p>
-
-<p>You will only get the second tick if both you and one of the recipients who read the message
-has <strong>Settings → Chats → Read Receipts</strong> enabled.</p>
     
       <h3 id="edit">
         
@@ -447,18 +456,19 @@ the (anyway encrypted) messages may take longer to get deleted from their server
       <h3 id="delold">
         
         
-          What happens if I turn on “Delete Messages from Device”? <a href="#delold" class="anchor"></a>
+          What happens if I turn on “Delete old messages from device”? <a href="#delold" class="anchor"></a>
         
         
       </h3>
 
-<p>If you want to save storage on your device, you can choose to delete old
-messages automatically.</p>
-
-<p>To turn it on, go to <strong>Settings → Chats → Delete Message from Device</strong>.
-You can set a timeframe between “after an hour” and “after a year”;
+<ul>
+  <li>If you want to save storage on your device, you can choose to delete old
+messages automatically.</li>
+  <li>To turn it on, go to “delete old messages from device” in the “Chats &amp; Media”
+settings. You can set a timeframe between “after an hour” and “after a year”;
 this way, <em>all</em> messages will be deleted from your device as soon as they are
-older than that.</p>
+older than that.</li>
+</ul>
     
       <h3 id="remove-account">
         
@@ -506,15 +516,9 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
       </h3>
 
 <ul>
-  <li>
-    <p>Select <strong>New chat</strong> and then <strong>New group</strong> from the menu in the upper right corner or hit the corresponding button on Android/iOS.</p>
-  </li>
-  <li>
-    <p>On the following screen, select the <strong>group members</strong> and define a <strong>group name</strong>. You can also select a <strong>group avatar</strong>.</p>
-  </li>
-  <li>
-    <p>As soon as you write the <strong>first message</strong> in the group, all members are informed about the new group and can answer in the group (as long as you do not write a message in the group the group is invisible to the members).</p>
-  </li>
+  <li>Select <strong>New chat</strong> and then <strong>New group</strong> from the menu in the upper right corner or hit the corresponding button on Android/iOS.</li>
+  <li>On the following screen, select the <strong>group members</strong> and define a <strong>group name</strong>. You can also select a <strong>group avatar</strong>.</li>
+  <li>As soon as you write the <strong>first message</strong> in the group, all members are informed about the new group and can answer in the group (as long as you do not write a message in the group the group is invisible to the members).</li>
 </ul>
     
       <h3 id="addmembers">
@@ -525,10 +529,11 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
         
       </h3>
 
-<p>All group members have the <strong>same rights</strong>.
-For this reason, everyone can delete any member or add new ones.</p>
-
 <ul>
+  <li>
+    <p>All group members have the <strong>same rights</strong>.
+For this reason, everyone can delete any member or add new ones.</p>
+  </li>
   <li>
     <p>To <strong>add or delete members</strong>, tap the group name in the chat and select the member to add or remove.</p>
   </li>
@@ -556,8 +561,10 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
         
       </h3>
 
-<p>As you’re no longer a group member, you cannot add yourself again. 
-However, no problem, just ask any other group member in a normal chat to re-add you.</p>
+<ul>
+  <li>As you’re no longer a group member, you cannot add yourself again. 
+However, no problem, just ask any other group member in a normal chat to re-add you.</li>
+</ul>
     
       <h3 id="i-do-not-want-to-receive-the-messages-of-a-group-any-longer">
         
@@ -568,12 +575,15 @@ However, no problem, just ask any other group member in a normal chat to re-add
       </h3>
 
 <ul>
-  <li>Either delete yourself from the member list or delete the whole chat. 
-If you want to join the group again later on, ask another group member to add you again.</li>
-</ul>
-
-<p>As an alternative, you can also “Mute” a group - doing so means you get all messages and 
+  <li>
+    <p>Either delete yourself from the member list or delete the whole chat. 
+If you want to join the group again later on, ask another group member to add you again.</p>
+  </li>
+  <li>
+    <p>As an alternative, you can also “Mute” a group - doing so means you get all messages and 
 can still write, but are no longer notified of any new messages.</p>
+  </li>
+</ul>
     
       <h3 id="cloning-a-group">
         
@@ -599,21 +609,6 @@ or right-click the group in the chat list (Desktop).</p>
 <p>The new group is <strong>fully independent</strong> from the original,
 which continues to work as before.</p>
     
-      <h3 id="how-many-members-can-participate-in-a-single-group">
-        
-        
-          How many members can participate in a single group? <a href="#how-many-members-can-participate-in-a-single-group" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>There is no strict technical limit,
-but more than 150 is not recommended.</p>
-
-<p>As groups get larger, they can become socially unstable and may need a hierarchy -
-where Delta Chat is a private messenger for chatting with <a href="#groups">equal rights</a>.
-See <a href="https://en.wikipedia.org/wiki/Dunbar%27s_number">Dunbar’s number</a> for more insights.</p>
-    
       <h2 id="webxdc">
         
         
@@ -655,7 +650,7 @@ This makes Delta Chat a truly extensible messenger.</p>
     <p>In-chat apps can not send data to the Internet, or download anything.</p>
   </li>
   <li>
-    <p>An in-chat app can only exchange data within a chat, with its
+    <p>An in-chat app can only exchange data within a Delta Chat chat, with its
 copies on the devices of your chat partners. Other than that, it’s completely
 isolated from the Internet.</p>
   </li>
@@ -902,7 +897,7 @@ One device is not needed for the other to work.</p>
     <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
   </li>
   <li>
-    <p>On <strong>Windows</strong>, go to “Control Panel / Network and Internet”
+    <p>On <strong>Windows</strong>, go to <strong>Control Panel / Network and Internet</strong>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
@@ -954,21 +949,22 @@ try the <strong>manual transfer</strong> described below</p>
 <p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
-  <li>
-    <p>On the old device, go to <strong>Settings → Chats → Export Backup</strong>. Enter your
+  <li>On the old device, go to “Settings -&gt; Chats and media -&gt; Export Backup”. Enter your
 screen unlock PIN, pattern, or password. Then you can click on “Start
 Backup”. This saves the backup file to your device. Now you have to transfer
-it to the other device somehow.</p>
-  </li>
-  <li>
-    <p>On the new device, select <strong>I Already Have a Profile → Restore from Backup</strong>.
-If you use iOS and encounter difficulties,
-<a href="https://support.delta.chat/t/import-backup-to-ios/1628">this guide</a> might help you.</p>
+it to the other device somehow.</li>
+  <li>On the new device, in the “I already have a profile” menu,
+choose “restore from backup”. After import, your conversations, encryption
+keys, and media should be copied to the new device.
+    <ul>
+      <li><strong>If you use iOS:</strong> and you encounter difficulties, maybe
+<a href="https://support.delta.chat/t/import-backup-to-ios/1628">this guide</a> will
+help you.</li>
+    </ul>
   </li>
+  <li>You are now synchronized, and can use both devices for sending and receiving
+end-to-end encrypted messages with your communication partners.</li>
 </ul>
-
-<p>You are now synchronized, and can use both devices for sending and receiving
-end-to-end encrypted messages with your communication partners.</p>
     
       <h3 id="are-there-any-plans-for-introducing-a-delta-chat-web-client">
         
@@ -997,10 +993,10 @@ or the AppImage for Linux. You can find them on
         
       </h2>
     
-      <h3 id="experiments">
+      <h3 id="experimental-features">
         
         
-          Experimental Features <a href="#experiments" class="anchor"></a>
+          Experimental Features <a href="#experimental-features" class="anchor"></a>
         
         
       </h3>
@@ -1013,44 +1009,33 @@ you can try out features we are working on.</p>
 <p>You can find more information
 and give feedback in the <a href="https://support.delta.chat">Forum</a>.</p>
     
-      <h3 id="relays">
+      <h3 id="statssending">
         
         
-          What are Relays? <a href="#relays" class="anchor"></a>
+          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
         
         
       </h3>
 
-<p>Relays are used to temporarily hold messages in case your device is offline.
-Relays are cheap and dumb servers,
-that do not store data as group states, your name or avatar -
-all that exist only on your device.
-Relays are operated by different groups and people.</p>
+<p>We would like to improve Delta Chat with your help,
+which is why Delta Chat for Android asks whether you want
+to send anonymous usage statistics.</p>
 
-<p>By default, after installation, a relay is <strong>automatically set up</strong>,
-so you do not need to care about that.
-However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+<p>You can turn it on and off at
+<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
+
+<p>When you turn it on,
+weekly statistics will be automatically sent to a bot.</p>
+
+<p>We are interested e.g. in statistics like:</p>
 
 <ul>
-  <li>
-    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
-  </li>
-  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
-  </li>
-  <li>
-    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
-  </li>
+  <li>How many contacts are introduced by personally scanning a QR code?</li>
+  <li>Which versions of Delta Chat are being used?</li>
+  <li>How many messages are unencrypted?</li>
 </ul>
 
-<p>For more details and future possibilities of relays,
-you can follow discussions in the <a href="https://support.delta.chat">Forum</a>.</p>
+<p>We will <em>not</em> collect any personally identifiable information about you.</p>
     
       <h3 id="can-i-use-a-classic-email-address-with-delta-chat">
         
@@ -1072,7 +1057,7 @@ while chatmail apps and relays pervasively enforce end-to-end encryption and sec
   </li>
   <li>
     <p>Non-chatmail apps use email servers as a long-term message archive
-while chatmail clients use email servers for ephemeral instant message relay.</p>
+while chatmail clients use email servers for ephemeral instant message transport.</p>
   </li>
   <li>
     <p>Supporting the full variety of classic email setups
@@ -1084,7 +1069,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
       <h3 id="classic-email">
         
         
-          How can I configure a chat profile with a classic email address as relay? <a href="#classic-email" class="anchor"></a>
+          How can I configure a chat profile with a classic email address as transport? <a href="#classic-email" class="anchor"></a>
         
         
       </h3>
@@ -1093,7 +1078,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
 unless you are prepared to deal with encrypted messages in the inbox,
 double notifications, accidentally deleted emails or similar annoyances.</p>
 
-<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Relay</strong>.
+<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Transport</strong>.
 Note that classic email providers will generally not support <a href="#instant-delivery">Push Notifications</a>
 and have other limitations, see <a href="https://providers.delta.chat">Provider Overview</a>.
 Chatmail uses the default INBOX for relay; ensure the provider setup does too. 
@@ -1117,40 +1102,6 @@ except if your users’ devices require Google/Apple <a href="#instant-delivery"
 and <a href="https://github.com/chatmail/core">core Rust developments</a> 
 that power <a href="https://chatmail.at/clients">chatmail clients</a> of which Delta Chat is the most well known.</p>
     
-      <h3 id="statssending">
-        
-        
-          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>We would like to improve Delta Chat with your help,
-which is why Delta Chat for Android asks whether you want
-to send anonymous usage statistics.</p>
-
-<p>You can turn it on and off at
-<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
-
-<p>When you turn it on,
-weekly statistics will be automatically sent to a bot.</p>
-
-<p>We are interested e.g. in statistics like:</p>
-
-<ul>
-  <li>
-    <p>How many contacts are introduced by personally scanning a QR code?</p>
-  </li>
-  <li>
-    <p>Which versions of Delta Chat are being used?</p>
-  </li>
-  <li>
-    <p>What errors occur for users?</p>
-  </li>
-</ul>
-
-<p>We will <em>not</em> collect any personally identifiable information about you.</p>
-    
       <h3 id="im-interested-in-the-technical-details-can-you-tell-me-more">
         
         
@@ -1159,7 +1110,9 @@ weekly statistics will be automatically sent to a bot.</p>
         
       </h3>
 
-<p>See <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Standards used in Delta Chat</a>.</p>
+<ul>
+  <li>See <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Standards used in Delta Chat</a>.</li>
+</ul>
     
       <h2 id="e2ee">
         
@@ -1398,32 +1351,6 @@ with the knowledge that all their data, along with all metadata, will be deleted
 Moreover, if a device is seized then chat contacts using short-lived profiles
 can not be identified easily.</p>
     
-      <h3 id="who-sees-my-ip-address">
-        
-        
-          Who sees my IP Address? <a href="#who-sees-my-ip-address" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>The used <a href="#relays">relay</a> needs to know your IP Address,
-as well as sometimes your contact’s devices if you have a <a href="#experiments">call</a>
-or use <a href="#webxdc">apps</a> together.</p>
-
-<p>IP Addresses are needed for connectivity and efficiency.
-They are neither persisted nor exposed.
-Note that the IP Address
-is not like a detailed address you give to a delivery service,
-but much more coarse, often defining region or country only.</p>
-
-<p>As this is just how the internet and other messengers work by default,
-we do not offer options here or ask upfront questions.</p>
-
-<p>If you see your IP Address as a security or privacy risk,
-we recommend to use a VPN, in combination with system lockdown mode.
-Hunting down options in all apps on your system will leave gaps.
-For example, tapping a link exposes IP Addresses to unknown parties and is the by far larger risk here.</p>
-    
       <h3 id="sealedsender">
         
         
@@ -1510,12 +1437,12 @@ the connection is safe.</p>
 
 <p>No.</p>
 
-<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1.
-We do not recommend or offer users to perform manual key management.
-We want to ensure that security audits can focus on a few proven cryptographic algorithms
-instead of the full breadth of possible algorithms allowed with OpenPGP.
-If you want to extract your OpenPGP key, there only is an expert method:
-you need to look it up in the “keypairs” SQLite table of a profile backup tar-file.</p>
+<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1. 
+You can export your private key but you can not import additional private keys.</p>
+
+<p>In general, we do not recommend or offer users to perform manual key management. 
+We want to ensure that security audits can focus on a few proven cryptographic algorithms 
+instead of the full breadth of possible algorithms allowed with OpenPGP.</p>
     
       <h3 id="security-audits">
         
@@ -1663,38 +1590,52 @@ ordered chronologically:</p>
 
 <ul>
   <li>
-    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
-program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
-along with collaboration partners working on
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>,
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>,
-<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and
-<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>.
-All of these projects are partially completed or to be completed in early 2025.</p>
+    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
+and implementation of verified groups and setup contact protocols
+in 2017 and 2018 and also helped to integrate end-to-end Encryption
+through <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p>In 2021 we received further EU funding for two Next-Generation-Internet
-proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a 
+first 2018/2019 grant (~$200K) during which we majorly improved the Android app 
+and released a first Desktop app beta version, and which moreover 
+moored our feature developments in UX research in human rights contexts, 
+see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
+The second 2019/2020 grant (~$300K) helped us to 
+release Delta/iOS versions, to convert our core library to Rust, and
+to provide new features for all platforms.</p>
   </li>
   <li>
     <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
 completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
   </li>
   <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p>In 2021 we received further EU funding for two Next-Generation-Internet
+proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
   </li>
   <li>
-    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
-and implementation of verified groups and setup contact protocols
-in 2017 and 2018 and also helped to integrate end-to-end Encryption
-through <a href="https://autocrypt.org">Autocrypt</a>.</p>
+    <p>From End 2021 till March 2023 we received <em>Internet Freedom</em> funding (500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supported our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of email servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
+  </li>
+  <li>
+    <p>2023-2024 we successfully completed the OTF-funded 
+<a href="https://www.opentech.fund/projects-we-support/supported-projects/secure-chat-mail-with-delta-chat/">Secure Chatmail project</a>, 
+allowing us to introduce guaranteed encryption, 
+creating a <a href="https://delta.chat/chatmail">chatmail server network</a> 
+and providing “instant onboarding” in all apps released from April 2024 on.</p>
+  </li>
+  <li>
+    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
+program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
+along with collaboration partners working on 
+<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>, 
+<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>, 
+<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and 
+<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>. 
+All of these projects are partially completed or to be completed in early 2025.</p>
   </li>
   <li>
     <p>Terkadang kami menerima sumbangan satu kali dari perorangan. 

src/main/assets/help/nl/help.html

@@ -26,7 +26,6 @@
       <li><a href="#ik-heb-mezelf-per-ongeluk-verwijderd">Ik heb mezelf per ongeluk verwijderd</a></li>
       <li><a href="#ik-wil-geen-groepsberichten-meer-ontvangen">Ik wil geen groepsberichten meer ontvangen</a></li>
       <li><a href="#cloning-a-group">Cloning a group</a></li>
-      <li><a href="#how-many-members-can-participate-in-a-single-group">How many members can participate in a single group?</a></li>
     </ul>
   </li>
   <li><a href="#webxdc">In-chat apps</a>
@@ -55,12 +54,11 @@
   </li>
   <li><a href="#advanced">Advanced</a>
     <ul>
-      <li><a href="#experiments">Experimental Features</a></li>
-      <li><a href="#relays">What are Relays?</a></li>
-      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
-      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as relay?</a></li>
-      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
+      <li><a href="#experimental-features">Experimental Features</a></li>
       <li><a href="#statssending">What is “Send statistics to Delta Chat’s developers”?</a></li>
+      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
+      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as transport?</a></li>
+      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
       <li><a href="#ik-wil-graag-meer-weten-over-de-gebruikte-technieken-waar-kan-ik-meer-informatie-vinden">Ik wil graag meer weten over de gebruikte technieken. Waar kan ik meer informatie vinden?</a></li>
     </ul>
   </li>
@@ -77,7 +75,6 @@
       <li><a href="#tls">Are messages marked with the mail icon exposed on the Internet?</a></li>
       <li><a href="#message-metadata">How does Delta Chat protect metadata in messages?</a></li>
       <li><a href="#device-seizure">How to protect metadata and contacts when a device is seized?</a></li>
-      <li><a href="#who-sees-my-ip-address">Who sees my IP Address?</a></li>
       <li><a href="#sealedsender">Does Delta Chat support “Sealed Sender”?</a></li>
       <li><a href="#pfs">Does Delta Chat support Perfect Forward Secrecy?</a></li>
       <li><a href="#pqc">Does Delta Chat support Post-Quantum-Cryptography?</a></li>
@@ -187,8 +184,7 @@ If you add each other to <a href="#groups">groups</a>, end-to-end encryption wil
 <p>As being a private messenger,
 only friends and family you <a href="#howtoe2ee">share your QR code or invite link with</a> can write to you.</p>
 
-<p>Your friends may share your contact with other friends,
-this appears as <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Request</b></p>
+<p>Your friends may share your contact with other friends, this appears as a <strong>request</strong>.</p>
 
 <ul>
   <li>
@@ -226,10 +222,15 @@ and can tap it to start chatting with the first contact.</p>
         
       </h3>
 
-<p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
+<ul>
+  <li>
+    <p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
 or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>Om de prestaties te verhogen, worden afbeeldingen standaard geoptimaliseerd en verkleind verstuurd, maar je kunt ze als een bestand verzenden om het origineel te sturen.</p>
+  </li>
+  <li>
+    <p>Om de prestaties te verhogen, worden afbeeldingen standaard geoptimaliseerd en verkleind verstuurd, maar je kunt ze als een bestand verzenden om het origineel te sturen.</p>
+  </li>
+</ul>
     
       <h3 id="multiple-accounts">
         
@@ -260,11 +261,16 @@ or to <strong>Switch Profiles</strong>.</p>
         
       </h3>
 
-<p>In de instellingen kun je een profielfoto toevoegen. Als je een bericht stuurt aan
-  je contactpersonen of ze toevoegt middels hun QR-code, dan krijgen ze je profielfoto te zien.</p>
-
-<p>Omwille van je privacy, krijgen anderen je profielfoto pas te zien
-  als je ze een bericht stuurt.</p>
+<ul>
+  <li>
+    <p>In de instellingen kun je een profielfoto toevoegen. Als je een bericht stuurt aan
+je contactpersonen of ze toevoegt middels hun QR-code, dan krijgen ze je profielfoto te zien.</p>
+  </li>
+  <li>
+    <p>Omwille van je privacy, krijgen anderen je profielfoto pas te zien
+als je ze een bericht stuurt.</p>
+  </li>
+</ul>
     
       <h3 id="signature">
         
@@ -297,7 +303,8 @@ they will see it when they view your contact details.</p>
     <p>Stel gesprekken in op <strong>Negeren</strong> als je geen meldingen meer wilt ontvangen. Wel blijven genegeerde gesprekken op de lijst staan en kun je ze te allen tijde vastmaken.</p>
   </li>
   <li>
-    <p><strong>Archiveer gesprekken</strong> als je ze niet meer op de gesprekslijst wilt zien. Gearchiveerde gesprekken zijn te allen tijde te bekijken boven de lijst of via een zoekopdracht.</p>
+    <p><strong>Archiveer gesprekken</strong> als je ze niet meer op de gesprekslijst wilt zien.
+Gearchiveerde gesprekken zijn te allen tijde te bekijken boven de lijst of via een zoekopdracht.</p>
   </li>
   <li>
     <p>Als er een nieuw bericht in een gearchiveerd gesprek wordt ontvangen, dan wordt het gesprek in kwestie <strong>ge-dearchiveerd</strong> en dus weer op de gesprekslijst geplaatst.
@@ -333,7 +340,7 @@ By tapping <img style="vertical-align:middle; width:1.2em; margin:1px" src="../g
 you can go back to the original message in the original chat</p>
   </li>
   <li>
-    <p>Finally, you can also use “Saved Messages” to take <strong>personal notes</strong> - open the chat, type something, add a photo or a voice message etc.</p>
+    <p>Finally, you can also use “Save Messages” to take <strong>personal notes</strong> - open the chat, type something, add a photo or a voice message etc.</p>
   </li>
   <li>
     <p>As “Saved Message” are synced, they can become very handy for transferring data between devices</p>
@@ -370,18 +377,22 @@ and others will as well not always see that you are “online”.</p>
 <ul>
   <li>
     <p><strong>One tick</strong> <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick1.png" alt="" />
-means that the message was sent successfully to the <a href="#relays">relay</a>.</p>
+means that the message was sent successfully to your provider.</p>
   </li>
   <li>
     <p><strong>Two ticks</strong>  <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick2.png" alt="" />
-indicate your contact has read the message.</p>
+mean that at least one recipient’s device
+reported back to having received the message.</p>
+  </li>
+  <li>
+    <p>Recipients may have disabled read-receipts,
+so even if you see only one tick, the message may have been read.</p>
+  </li>
+  <li>
+    <p>The other way round, two ticks do not automatically mean
+that a human has read or understood the message ;)</p>
   </li>
 </ul>
-
-<p>In <a href="#groups">groups</a> the second tick means that at least one member has reported back having read the message.</p>
-
-<p>You will only get the second tick if both you and one of the recipients who read the message
-has <strong>Settings → Chats → Read Receipts</strong> enabled.</p>
     
       <h3 id="edit">
         
@@ -451,9 +462,12 @@ the (anyway encrypted) messages may take longer to get deleted from their server
         
       </h3>
 
-<p>Als je ruimte wilt besparen op je apparaat, dan kun je er voor kiezen om oude berichten automatisch te verwijderen.</p>
-
-<p>Inschakelen kan via de sectie ‘Gesprekken en media’ in de instellingen. Je kunt een periode tussen ‘na één uur’ en ‘na één jaar’ kiezen. <em>Alle</em> berichten die ouder zijn, worden verwijderd.</p>
+<ul>
+  <li>Als je ruimte wilt besparen op je apparaat, dan kun je er voor kiezen om oude
+berichten automatisch te verwijderen.</li>
+  <li>Inschakelen kan via de sectie ‘Gesprekken en media’ in de instellingen. Je kunt een periode tussen
+‘na één uur’ en ‘na één jaar’ kiezen. *Alle berichten die ouder zijn, worden verwijderd.</li>
+</ul>
     
       <h3 id="remove-account">
         
@@ -501,15 +515,9 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
       </h3>
 
 <ul>
-  <li>
-    <p>Open het ‘menu met de drie puntjes’ rechtsboven in het gespreksoverzicht, kies <strong>Nieuw gesprek</strong> en daarna <strong>Nieuwe groep</strong>.</p>
-  </li>
-  <li>
-    <p>Kies dan de <strong>groepsleden</strong> en druk op het vinkje rechtsboven. Daarna kun je een <strong>groepsnaam</strong> opgeven.</p>
-  </li>
-  <li>
-    <p>Zodra je het <strong>eerste groepsbericht</strong> hebt verstuurd, worden alle deelnemers op de hoogte gebracht en kunnen zij antwoorden versturen (de groep blijft onzichtbaar voor anderen zolang jij geen bericht verstuurt).</p>
-  </li>
+  <li>Open het ‘menu met de drie puntjes’ rechtsboven in het gespreksoverzicht, kies <strong>Nieuw gesprek</strong> en daarna <strong>Nieuwe groep</strong>.</li>
+  <li>Kies dan de <strong>groepsleden</strong> en druk op het vinkje rechtsboven. Daarna kun je een <strong>groepsnaam</strong> opgeven.</li>
+  <li>Zodra je het <strong>eerste groepsbericht</strong> hebt verstuurd, worden alle deelnemers op de hoogte gebracht en kunnen zij antwoorden versturen (de groep blijft onzichtbaar voor anderen zolang jij geen bericht verstuurt).</li>
 </ul>
     
       <h3 id="addmembers">
@@ -520,10 +528,11 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
         
       </h3>
 
-<p>All group members have the <strong>same rights</strong>.
-For this reason, everyone can delete any member or add new ones.</p>
-
 <ul>
+  <li>
+    <p>All group members have the <strong>same rights</strong>.
+For this reason, everyone can delete any member or add new ones.</p>
+  </li>
   <li>
     <p>To <strong>add or delete members</strong>, tap the group name in the chat and select the member to add or remove.</p>
   </li>
@@ -551,8 +560,10 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
         
       </h3>
 
-<p>Je neemt geen deel meer aan de groep en kunt jezelf dus niet meer toevoegen.
-  Vraag iemand via een één-op-ééngesprek of hij/zij je weer wilt toevoegen.</p>
+<ul>
+  <li>Je neemt geen deel meer aan de groep en kunt jezelf dus niet meer toevoegen.
+Vraag iemand via een één-op-ééngesprek of hij/zij je weer wilt toevoegen.</li>
+</ul>
     
       <h3 id="ik-wil-geen-groepsberichten-meer-ontvangen">
         
@@ -563,12 +574,15 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
       </h3>
 
 <ul>
-  <li>Verwijder jezelf van de groepslijst of verwijder het hele groepsgesprek.
-Als je later weer wilt deelnemen, vraag dan iemand anders of hij/zij je weer wilt toevoegen.</li>
+  <li>
+    <p>Verwijder jezelf van de groepslijst of verwijder het hele groepsgesprek.
+Als je later weer wilt deelnemen, vraag dan iemand anders of hij/zij je weer wilt toevoegen.</p>
+  </li>
+  <li>
+    <p>Wat ook kan doen is groepsmeldingen uitschakelen. Zo blijf je in de groep, maar ontvang je
+geen meldingen meer als er nieuwe berichten zijn.</p>
+  </li>
 </ul>
-
-<p>Wat ook kan doen is groepsmeldingen uitschakelen. Zo blijf je in de groep, maar ontvang je
-  geen meldingen meer als er nieuwe berichten zijn.</p>
     
       <h3 id="cloning-a-group">
         
@@ -594,21 +608,6 @@ or right-click the group in the chat list (Desktop).</p>
 <p>The new group is <strong>fully independent</strong> from the original,
 which continues to work as before.</p>
     
-      <h3 id="how-many-members-can-participate-in-a-single-group">
-        
-        
-          How many members can participate in a single group? <a href="#how-many-members-can-participate-in-a-single-group" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>There is no strict technical limit,
-but more than 150 is not recommended.</p>
-
-<p>As groups get larger, they can become socially unstable and may need a hierarchy -
-where Delta Chat is a private messenger for chatting with <a href="#groups">equal rights</a>.
-See <a href="https://en.wikipedia.org/wiki/Dunbar%27s_number">Dunbar’s number</a> for more insights.</p>
-    
       <h2 id="webxdc">
         
         
@@ -650,7 +649,7 @@ This makes Delta Chat a truly extensible messenger.</p>
     <p>In-chat apps can not send data to the Internet, or download anything.</p>
   </li>
   <li>
-    <p>An in-chat app can only exchange data within a chat, with its
+    <p>An in-chat app can only exchange data within a Delta Chat chat, with its
 copies on the devices of your chat partners. Other than that, it’s completely
 isolated from the Internet.</p>
   </li>
@@ -896,7 +895,7 @@ op beide apparaten</strong>. Hierdoor hoef je niet het ene apparaat bij de hand
     <p>Controleer of beide apparaten verbonden zijn met <strong>hetzelfde (wifi)netwerk</strong></p>
   </li>
   <li>
-    <p>On <strong>Windows</strong>, go to “Control Panel / Network and Internet”
+    <p>On <strong>Windows</strong>, go to <strong>Control Panel / Network and Internet</strong>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
@@ -948,21 +947,22 @@ volg dan onderstaande stappen omtrent handmatige overzetting</p>
 <p>Deze methode is vooral bedoeld voor situaties waarin ‘Tweede apparaat toevoegen’ niet lukt.</p>
 
 <ul>
-  <li>
-    <p>On the old device, go to <strong>Settings → Chats → Export Backup</strong>. Enter your
+  <li>On the old device, go to “Settings -&gt; Chats and media -&gt; Export Backup”. Enter your
 screen unlock PIN, pattern, or password. Then you can click on “Start
 Backup”. This saves the backup file to your device. Now you have to transfer
-it to the other device somehow.</p>
-  </li>
-  <li>
-    <p>On the new device, select <strong>I Already Have a Profile → Restore from Backup</strong>.
-If you use iOS and encounter difficulties,
-<a href="https://support.delta.chat/t/import-backup-to-ios/1628">this guide</a> might help you.</p>
+it to the other device somehow.</li>
+  <li>On the new device, in the “I already have a profile” menu,
+choose “restore from backup”. After import, your conversations, encryption
+keys, and media should be copied to the new device.
+    <ul>
+      <li><strong>If you use iOS:</strong> and you encounter difficulties, maybe
+<a href="https://support.delta.chat/t/import-backup-to-ios/1628">this guide</a> will
+help you.</li>
+    </ul>
   </li>
+  <li>You are now synchronized, and can use both devices for sending and receiving
+end-to-end encrypted messages with your communication partners.</li>
 </ul>
-
-<p>You are now synchronized, and can use both devices for sending and receiving
-end-to-end encrypted messages with your communication partners.</p>
     
       <h3 id="bestaan-er-plannen-om-een-delta-chat-webclient-te-maken">
         
@@ -991,10 +991,10 @@ of de AppImage van de Linux-client. Deze kun je downloaden op
         
       </h2>
     
-      <h3 id="experiments">
+      <h3 id="experimental-features">
         
         
-          Experimental Features <a href="#experiments" class="anchor"></a>
+          Experimental Features <a href="#experimental-features" class="anchor"></a>
         
         
       </h3>
@@ -1007,44 +1007,33 @@ you can try out features we are working on.</p>
 <p>You can find more information
 and give feedback in the <a href="https://support.delta.chat">Forum</a>.</p>
     
-      <h3 id="relays">
+      <h3 id="statssending">
         
         
-          What are Relays? <a href="#relays" class="anchor"></a>
+          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
         
         
       </h3>
 
-<p>Relays are used to temporarily hold messages in case your device is offline.
-Relays are cheap and dumb servers,
-that do not store data as group states, your name or avatar -
-all that exist only on your device.
-Relays are operated by different groups and people.</p>
+<p>We would like to improve Delta Chat with your help,
+which is why Delta Chat for Android asks whether you want
+to send anonymous usage statistics.</p>
 
-<p>By default, after installation, a relay is <strong>automatically set up</strong>,
-so you do not need to care about that.
-However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+<p>You can turn it on and off at
+<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
+
+<p>When you turn it on,
+weekly statistics will be automatically sent to a bot.</p>
+
+<p>We are interested e.g. in statistics like:</p>
 
 <ul>
-  <li>
-    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
-  </li>
-  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
-  </li>
-  <li>
-    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
-  </li>
+  <li>How many contacts are introduced by personally scanning a QR code?</li>
+  <li>Which versions of Delta Chat are being used?</li>
+  <li>How many messages are unencrypted?</li>
 </ul>
 
-<p>For more details and future possibilities of relays,
-you can follow discussions in the <a href="https://support.delta.chat">Forum</a>.</p>
+<p>We will <em>not</em> collect any personally identifiable information about you.</p>
     
       <h3 id="can-i-use-a-classic-email-address-with-delta-chat">
         
@@ -1066,7 +1055,7 @@ while chatmail apps and relays pervasively enforce end-to-end encryption and sec
   </li>
   <li>
     <p>Non-chatmail apps use email servers as a long-term message archive
-while chatmail clients use email servers for ephemeral instant message relay.</p>
+while chatmail clients use email servers for ephemeral instant message transport.</p>
   </li>
   <li>
     <p>Supporting the full variety of classic email setups
@@ -1078,7 +1067,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
       <h3 id="classic-email">
         
         
-          How can I configure a chat profile with a classic email address as relay? <a href="#classic-email" class="anchor"></a>
+          How can I configure a chat profile with a classic email address as transport? <a href="#classic-email" class="anchor"></a>
         
         
       </h3>
@@ -1087,7 +1076,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
 unless you are prepared to deal with encrypted messages in the inbox,
 double notifications, accidentally deleted emails or similar annoyances.</p>
 
-<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Relay</strong>.
+<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Transport</strong>.
 Note that classic email providers will generally not support <a href="#instant-delivery">Push Notifications</a>
 and have other limitations, see <a href="https://providers.delta.chat">Provider Overview</a>.
 Chatmail uses the default INBOX for relay; ensure the provider setup does too. 
@@ -1111,40 +1100,6 @@ except if your users’ devices require Google/Apple <a href="#instant-delivery"
 and <a href="https://github.com/chatmail/core">core Rust developments</a> 
 that power <a href="https://chatmail.at/clients">chatmail clients</a> of which Delta Chat is the most well known.</p>
     
-      <h3 id="statssending">
-        
-        
-          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>We would like to improve Delta Chat with your help,
-which is why Delta Chat for Android asks whether you want
-to send anonymous usage statistics.</p>
-
-<p>You can turn it on and off at
-<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
-
-<p>When you turn it on,
-weekly statistics will be automatically sent to a bot.</p>
-
-<p>We are interested e.g. in statistics like:</p>
-
-<ul>
-  <li>
-    <p>How many contacts are introduced by personally scanning a QR code?</p>
-  </li>
-  <li>
-    <p>Which versions of Delta Chat are being used?</p>
-  </li>
-  <li>
-    <p>What errors occur for users?</p>
-  </li>
-</ul>
-
-<p>We will <em>not</em> collect any personally identifiable information about you.</p>
-    
       <h3 id="ik-wil-graag-meer-weten-over-de-gebruikte-technieken-waar-kan-ik-meer-informatie-vinden">
         
         
@@ -1153,7 +1108,9 @@ weekly statistics will be automatically sent to a bot.</p>
         
       </h3>
 
-<p>Bekijk de pagina <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Door Delta Chat gebruikte standaarden</a>.</p>
+<ul>
+  <li>Bekijk de pagina <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Door Delta Chat gebruikte standaarden</a>.</li>
+</ul>
     
       <h2 id="e2ee">
         
@@ -1392,32 +1349,6 @@ with the knowledge that all their data, along with all metadata, will be deleted
 Moreover, if a device is seized then chat contacts using short-lived profiles
 can not be identified easily.</p>
     
-      <h3 id="who-sees-my-ip-address">
-        
-        
-          Who sees my IP Address? <a href="#who-sees-my-ip-address" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>The used <a href="#relays">relay</a> needs to know your IP Address,
-as well as sometimes your contact’s devices if you have a <a href="#experiments">call</a>
-or use <a href="#webxdc">apps</a> together.</p>
-
-<p>IP Addresses are needed for connectivity and efficiency.
-They are neither persisted nor exposed.
-Note that the IP Address
-is not like a detailed address you give to a delivery service,
-but much more coarse, often defining region or country only.</p>
-
-<p>As this is just how the internet and other messengers work by default,
-we do not offer options here or ask upfront questions.</p>
-
-<p>If you see your IP Address as a security or privacy risk,
-we recommend to use a VPN, in combination with system lockdown mode.
-Hunting down options in all apps on your system will leave gaps.
-For example, tapping a link exposes IP Addresses to unknown parties and is the by far larger risk here.</p>
-    
       <h3 id="sealedsender">
         
         
@@ -1504,12 +1435,12 @@ the connection is safe.</p>
 
 <p>No.</p>
 
-<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1.
-We do not recommend or offer users to perform manual key management.
-We want to ensure that security audits can focus on a few proven cryptographic algorithms
-instead of the full breadth of possible algorithms allowed with OpenPGP.
-If you want to extract your OpenPGP key, there only is an expert method:
-you need to look it up in the “keypairs” SQLite table of a profile backup tar-file.</p>
+<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1. 
+You can export your private key but you can not import additional private keys.</p>
+
+<p>In general, we do not recommend or offer users to perform manual key management. 
+We want to ensure that security audits can focus on a few proven cryptographic algorithms 
+instead of the full breadth of possible algorithms allowed with OpenPGP.</p>
     
       <h3 id="security-audits">
         
@@ -1657,38 +1588,52 @@ ordered chronologically:</p>
 
 <ul>
   <li>
-    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
-program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
-along with collaboration partners working on
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>,
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>,
-<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and
-<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>.
-All of these projects are partially completed or to be completed in early 2025.</p>
+    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
+and implementation of verified groups and setup contact protocols
+in 2017 and 2018 and also helped to integrate end-to-end Encryption
+through <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p>In 2021 we received further EU funding for two Next-Generation-Internet
-proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+    <p><a href="https://opentechfund.org">Open Technology Fund</a> heeft twee subsidies toegekend.
+De eerste subsidie, voor 2018/2019, ter waarde van ong. $200,000, heeft enorm geholpen om de Android-app 
+te verbeteren en een bètaversie van de computerclient vrij te geven. 
+Verder hebben we onderzoek kunnen doen naar het uiterlijk in relatie tot mensenrechten - 
+bekijk onze conclusie hier: <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
+De tweede subsidie, voor 2019/2020, ter waarde van ong. $300,000, loopt nog en ondersteunt ons bij het 
+vrijgeven van de iOS-client, het overzetten van de code van de kernbibliotheek naar Rust en
+het implementeren van nieuwe functies op alle platformen.</p>
   </li>
   <li>
     <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
 completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
   </li>
   <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p>In 2021 we received further EU funding for two Next-Generation-Internet
+proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
   </li>
   <li>
-    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
-and implementation of verified groups and setup contact protocols
-in 2017 and 2018 and also helped to integrate end-to-end Encryption
-through <a href="https://autocrypt.org">Autocrypt</a>.</p>
+    <p>From End 2021 till March 2023 we received <em>Internet Freedom</em> funding (500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supported our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of email servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
+  </li>
+  <li>
+    <p>2023-2024 we successfully completed the OTF-funded 
+<a href="https://www.opentech.fund/projects-we-support/supported-projects/secure-chat-mail-with-delta-chat/">Secure Chatmail project</a>, 
+allowing us to introduce guaranteed encryption, 
+creating a <a href="https://delta.chat/chatmail">chatmail server network</a> 
+and providing “instant onboarding” in all apps released from April 2024 on.</p>
+  </li>
+  <li>
+    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
+program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
+along with collaboration partners working on 
+<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>, 
+<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>, 
+<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and 
+<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>. 
+All of these projects are partially completed or to be completed in early 2025.</p>
   </li>
   <li>
     <p>Soms ontvangen we eenmalige donaties van privépersonen, waar we

src/main/assets/help/pl/help.html

@@ -26,7 +26,6 @@
       <li><a href="#usunąłem-się-przez-przypadek">Usunąłem się przez przypadek.</a></li>
       <li><a href="#nie-chcę-już-otrzymywać-wiadomości-od-grupy">Nie chcę już otrzymywać wiadomości od grupy.</a></li>
       <li><a href="#cloning-a-group">Cloning a group</a></li>
-      <li><a href="#how-many-members-can-participate-in-a-single-group">How many members can participate in a single group?</a></li>
     </ul>
   </li>
   <li><a href="#webxdc">In-chat apps</a>
@@ -55,12 +54,11 @@
   </li>
   <li><a href="#zaawansowane">Zaawansowane</a>
     <ul>
-      <li><a href="#experiments">Experimental Features</a></li>
-      <li><a href="#relays">What are Relays?</a></li>
-      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
-      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as relay?</a></li>
-      <li><a href="#chcę-zarządzać-własnym-serwerem-dla-delta-chat-co-polecacie">Chcę zarządzać własnym serwerem dla Delta Chat. Co polecacie?</a></li>
+      <li><a href="#experimental-features">Experimental Features</a></li>
       <li><a href="#statssending">What is “Send statistics to Delta Chat’s developers”?</a></li>
+      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
+      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as transport?</a></li>
+      <li><a href="#chcę-zarządzać-własnym-serwerem-dla-delta-chat-co-polecacie">Chcę zarządzać własnym serwerem dla Delta Chat. Co polecacie?</a></li>
       <li><a href="#interesują-mnie-szczegóły-techniczne-możesz-powiedzieć-mi-coś-więcej">Interesują mnie szczegóły techniczne. Możesz powiedzieć mi coś więcej?</a></li>
     </ul>
   </li>
@@ -77,7 +75,6 @@
       <li><a href="#tls">Czy wiadomości oznaczone ikoną poczty są widoczne w internecie?</a></li>
       <li><a href="#message-metadata">W jaki sposób Delta Chat chroni metadane w wiadomościach?</a></li>
       <li><a href="#device-seizure">Jak chronić metadane i kontakty w przypadku przejęcia urządzenia?</a></li>
-      <li><a href="#who-sees-my-ip-address">Who sees my IP Address?</a></li>
       <li><a href="#sealedsender">Czy Delta Chat obsługuje funkcję „Sealed Sender”?</a></li>
       <li><a href="#pfs">Czy Delta Chat obsługuje funkcję Perfect Forward Secrecy?</a></li>
       <li><a href="#pqc">Czy Delta Chat obsługuje kryptografię postkwantową?</a></li>
@@ -105,7 +102,8 @@
         
       </h2>
 
-<p>Delta Chat to niezawodna, zdecentralizowana i bezpieczna aplikacja do błyskawicznego przesyłania wiadomości, dostępna na platformy mobilne i stacjonarne.</p>
+<p>Delta Chat is a reliable, decentralized and secure instant messaging app,
+available for mobile and desktop platforms.</p>
 
 <ul>
   <li>
@@ -186,8 +184,7 @@ If you add each other to <a href="#groups">groups</a>, end-to-end encryption wil
 <p>As being a private messenger,
 only friends and family you <a href="#howtoe2ee">share your QR code or invite link with</a> can write to you.</p>
 
-<p>Your friends may share your contact with other friends,
-this appears as <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Request</b></p>
+<p>Your friends may share your contact with other friends, this appears as a <strong>request</strong>.</p>
 
 <ul>
   <li>
@@ -223,10 +220,15 @@ and can tap it to start chatting with the first contact.</p>
         
       </h3>
 
-<p>Tak. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
+<ul>
+  <li>
+    <p>Tak. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
 or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>Ze względu na wydajność obrazy są domyślnie optymalizowane i wysyłane w mniejszym rozmiarze, ale można je wysłać jako „plik”, aby zachować oryginał.</p>
+  </li>
+  <li>
+    <p>Ze względu na wydajność obrazy są domyślnie optymalizowane i wysyłane w mniejszym rozmiarze, ale można je wysłać jako „plik”, aby zachować oryginał.</p>
+  </li>
+</ul>
     
       <h3 id="multiple-accounts">
         
@@ -256,9 +258,14 @@ and uses the server only to relay messages.</p>
         
       </h3>
 
-<p>Możesz dodać zdjęcie profilowe w swoich ustawieniach. Jeśli napiszesz do swoich kontaktów lub dodasz je za pomocą kodu QR, automatycznie zobaczą je jako Twoje zdjęcie profilowe.</p>
-
-<p>Ze względów prywatności nikt nie widzi Twojego zdjęcia profilowego, dopóki nie napiszesz do niego wiadomości.</p>
+<ul>
+  <li>
+    <p>Możesz dodać zdjęcie profilowe w swoich ustawieniach. Jeśli napiszesz do swoich kontaktów lub dodasz je za pomocą kodu QR, automatycznie zobaczą je jako Twoje zdjęcie profilowe.</p>
+  </li>
+  <li>
+    <p>Ze względów prywatności nikt nie widzi Twojego zdjęcia profilowego, dopóki nie napiszesz do niego wiadomości.</p>
+  </li>
+</ul>
     
       <h3 id="signature">
         
@@ -358,18 +365,22 @@ and others will as well not always see that you are “online”.</p>
 <ul>
   <li>
     <p><strong>One tick</strong> <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick1.png" alt="" />
-means that the message was sent successfully to the <a href="#relays">relay</a>.</p>
+means that the message was sent successfully to your provider.</p>
   </li>
   <li>
     <p><strong>Two ticks</strong>  <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick2.png" alt="" />
-indicate your contact has read the message.</p>
+mean that at least one recipient’s device
+reported back to having received the message.</p>
+  </li>
+  <li>
+    <p>Recipients may have disabled read-receipts,
+so even if you see only one tick, the message may have been read.</p>
+  </li>
+  <li>
+    <p>The other way round, two ticks do not automatically mean
+that a human has read or understood the message ;)</p>
   </li>
 </ul>
-
-<p>In <a href="#groups">groups</a> the second tick means that at least one member has reported back having read the message.</p>
-
-<p>You will only get the second tick if both you and one of the recipients who read the message
-has <strong>Settings → Chats → Read Receipts</strong> enabled.</p>
     
       <h3 id="edit">
         
@@ -426,9 +437,10 @@ the (anyway encrypted) messages may take longer to get deleted from their server
         
       </h3>
 
-<p>Jeśli chcesz zaoszczędzić miejsce na urządzeniu, możesz wybrać opcję automatycznego usuwania starych wiadomości.</p>
-
-<p>Aby ją włączyć, przejdź do „Usuń wiadomości z urządzenia” w ustawieniach w sekcji „Czaty i media”. Możesz ustawić przedział czasowy pomiędzy „po 1 godzinie” a „po 1 roku”; w ten sposób <em>wszystkie</em> wiadomości zostaną usunięte z urządzenia, gdy tylko staną się starsze.</p>
+<ul>
+  <li>Jeśli chcesz zaoszczędzić miejsce na urządzeniu, możesz wybrać opcję automatycznego usuwania starych wiadomości.</li>
+  <li>Aby ją włączyć, przejdź do „Usuń wiadomości z urządzenia” w ustawieniach w sekcji „Czaty i media”. Możesz ustawić przedział czasowy pomiędzy „po 1 godzinie” a „po 1 roku”; w ten sposób <em>wszystkie</em> wiadomości zostaną usunięte z urządzenia, gdy tylko staną się starsze.</li>
+</ul>
     
       <h3 id="remove-account">
         
@@ -476,15 +488,9 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
       </h3>
 
 <ul>
-  <li>
-    <p>Wybierz <strong>Nowy czat</strong>, a następnie <strong>Nowa grupa</strong> z menu w prawym górnym rogu lub naciśnij odpowiedni przycisk na Androidzie / iOS.</p>
-  </li>
-  <li>
-    <p>Na następnym ekranie wybierz <strong>członków grupy</strong> i zdefiniuj <strong>nazwę grupy</strong>. Możesz też wybrać awatar <strong>grupy</strong>.</p>
-  </li>
-  <li>
-    <p>Zaraz po napisaniu pierwszej wiadomości w grupie wszyscy członkowie zostaną poinformowani o nowej grupie i mogą odpowiedzieć w grupie (jeżeli nie napiszesz wiadomości w grupie, grupa jest niewidoczna dla członków).</p>
-  </li>
+  <li>Wybierz <strong>Nowy czat</strong>, a następnie <strong>Nowa grupa</strong> z menu w prawym górnym rogu lub naciśnij odpowiedni przycisk na Androidzie / iOS.</li>
+  <li>Na następnym ekranie wybierz <strong>członków grupy</strong> i zdefiniuj <strong>nazwę grupy</strong>. Możesz też wybrać awatar <strong>grupy</strong>.</li>
+  <li>Zaraz po napisaniu pierwszej wiadomości w grupie wszyscy członkowie zostaną poinformowani o nowej grupie i mogą odpowiedzieć w grupie (jeżeli nie napiszesz wiadomości w grupie, grupa jest niewidoczna dla członków).</li>
 </ul>
     
       <h3 id="addmembers">
@@ -495,10 +501,11 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
         
       </h3>
 
-<p>All group members have the <strong>same rights</strong>.
-For this reason, everyone can delete any member or add new ones.</p>
-
 <ul>
+  <li>
+    <p>All group members have the <strong>same rights</strong>.
+For this reason, everyone can delete any member or add new ones.</p>
+  </li>
   <li>
     <p>To <strong>add or delete members</strong>, tap the group name in the chat and select the member to add or remove.</p>
   </li>
@@ -526,8 +533,10 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
         
       </h3>
 
-<p>Ponieważ nie jesteś członkiem grupy, nie możesz dodać siebie ponownie. 
-  Jednak nie ma problemu, po prostu poproś dowolnego członka grupy na normalnym czacie, aby dodał cię ponownie.</p>
+<ul>
+  <li>Ponieważ nie jesteś członkiem grupy, nie możesz dodać siebie ponownie. 
+Jednak nie ma problemu, po prostu poproś dowolnego członka grupy na normalnym czacie, aby dodał cię ponownie.</li>
+</ul>
     
       <h3 id="nie-chcę-już-otrzymywać-wiadomości-od-grupy">
         
@@ -538,12 +547,15 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
       </h3>
 
 <ul>
-  <li>Usuń siebie z listy członków lub usuń cały czat. 
-Jeśli później będziesz chciał ponownie dołączyć do grupy, poproś innego członka grupy, aby dodał cię do grupy.</li>
+  <li>
+    <p>Usuń siebie z listy członków lub usuń cały czat. 
+Jeśli później będziesz chciał ponownie dołączyć do grupy, poproś innego członka grupy, aby dodał cię do grupy.</p>
+  </li>
+  <li>
+    <p>Alternatywnie możesz też „Wyłączyć powiadomienia” dla grupy  dzięki temu otrzymasz wszystkie wiadomości i 
+nadal będziesz mógł pisać, ale nie będziesz już powiadamiany o żadnych nowych wiadomościach.</p>
+  </li>
 </ul>
-
-<p>Alternatywnie możesz też „Wyłączyć powiadomienia” dla grupy  dzięki temu otrzymasz wszystkie wiadomości i 
-  nadal będziesz mógł pisać, ale nie będziesz już powiadamiany o żadnych nowych wiadomościach.</p>
     
       <h3 id="cloning-a-group">
         
@@ -569,21 +581,6 @@ or right-click the group in the chat list (Desktop).</p>
 <p>The new group is <strong>fully independent</strong> from the original,
 which continues to work as before.</p>
     
-      <h3 id="how-many-members-can-participate-in-a-single-group">
-        
-        
-          How many members can participate in a single group? <a href="#how-many-members-can-participate-in-a-single-group" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>There is no strict technical limit,
-but more than 150 is not recommended.</p>
-
-<p>As groups get larger, they can become socially unstable and may need a hierarchy -
-where Delta Chat is a private messenger for chatting with <a href="#groups">equal rights</a>.
-See <a href="https://en.wikipedia.org/wiki/Dunbar%27s_number">Dunbar’s number</a> for more insights.</p>
-    
       <h2 id="webxdc">
         
         
@@ -625,7 +622,7 @@ This makes Delta Chat a truly extensible messenger.</p>
     <p>In-chat apps can not send data to the Internet, or download anything.</p>
   </li>
   <li>
-    <p>An in-chat app can only exchange data within a chat, with its
+    <p>An in-chat app can only exchange data within a Delta Chat chat, with its
 copies on the devices of your chat partners. Other than that, it’s completely
 isolated from the Internet.</p>
   </li>
@@ -836,7 +833,7 @@ Welcome to the power of the interoperable chatmail relay network :)</p>
     <p>Sprawdź dokładnie, czy oba urządzenia są w tym <strong>samym Wi-Fi lub tej samej sieci</strong></p>
   </li>
   <li>
-    <p>Na <strong>Windowsie</strong>, przejdź do “Panel sterowania / Sieć i internet” i upewnij się, że <strong>Sieć prywatna</strong> jest wybrana jako “Typ profilu sieci”
+    <p>Na <strong>Windowsie</strong>, przejdź do <strong>Panel sterowania / Sieć i internet</strong> i upewnij się, że <strong>Sieć prywatna</strong> jest wybrana jako “Typ profilu sieci”
 (po przeniesieniu możesz wrócić do pierwotnej wartości)</p>
   </li>
   <li>
@@ -880,16 +877,14 @@ Welcome to the power of the interoperable chatmail relay network :)</p>
 <p>Ta metoda jest zalecana tylko wtedy, gdy opisana powyżej opcja „Dodaj kolejne urządzenie” nie działa.</p>
 
 <ul>
-  <li>
-    <p>Na starym urządzeniu przejdź do <strong>Ustawienia → Czaty i media → Eksport kopii zapasowej</strong>. Wprowadź swój PIN odblokowania ekranu, wzór lub hasło. Następnie możesz nacisnąć „Utwórz kopię”. Spowoduje to zapisanie pliku kopii zapasowej na urządzeniu. Teraz musisz jakoś przenieść go na inne urządzenie.</p>
-  </li>
-  <li>
-    <p>Na nowym urządzeniu, na ekranie logowania, zamiast logować się na swoje konto e-mail, wybierz <strong>Przywróć z kopii zapasowej</strong>. Po zaimportowaniu Twoje rozmowy, klucze szyfrujące i multimedia powinny zostać skopiowane na nowe urządzenie.
-Jeśli korzystasz z iOS i napotykasz trudności, może <a href="https://support.delta.chat/t/import-backup-to-ios/1628">ten poradnik</a> Ci pomoże.</p>
+  <li>Na starym urządzeniu przejdź do „Ustawienia » Czaty i media » Eksport kopii zapasowej”. Wprowadź swój PIN odblokowania ekranu, wzór lub hasło. Następnie możesz nacisnąć „Utwórz kopię”. Spowoduje to zapisanie pliku kopii zapasowej na urządzeniu. Teraz musisz jakoś przenieść go na inne urządzenie.</li>
+  <li>Na nowym urządzeniu, na ekranie logowania, zamiast logować się na swoje konto e-mail, wybierz „Przywróć z kopii zapasowej”. Po zaimportowaniu Twoje rozmowy, klucze szyfrujące i multimedia powinny zostać skopiowane na nowe urządzenie.
+    <ul>
+      <li><strong>Jeśli korzystasz z iOS</strong> i napotykasz trudności, może <a href="https://support.delta.chat/t/import-backup-to-ios/1628">ten poradnik</a> Ci pomoże.</li>
+    </ul>
   </li>
+  <li>Jesteś teraz zsynchronizowany i możesz używać obu urządzeń do wysyłania i odbierania wiadomości zaszyfrowanych end-to-end w komunikacji ze swoimi partnerami.</li>
 </ul>
-
-<p>Jesteś teraz zsynchronizowany i możesz używać obu urządzeń do wysyłania i odbierania wiadomości zaszyfrowanych end-to-end w komunikacji ze swoimi partnerami.</p>
     
       <h3 id="czy-są-jakieś-plany-wprowadzenia-klienta-web-delta-chat">
         
@@ -913,10 +908,10 @@ Jeśli korzystasz z iOS i napotykasz trudności, może <a href="https://support.
         
       </h2>
     
-      <h3 id="experiments">
+      <h3 id="experimental-features">
         
         
-          Experimental Features <a href="#experiments" class="anchor"></a>
+          Experimental Features <a href="#experimental-features" class="anchor"></a>
         
         
       </h3>
@@ -929,44 +924,33 @@ you can try out features we are working on.</p>
 <p>You can find more information
 and give feedback in the <a href="https://support.delta.chat">Forum</a>.</p>
     
-      <h3 id="relays">
+      <h3 id="statssending">
         
         
-          What are Relays? <a href="#relays" class="anchor"></a>
+          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
         
         
       </h3>
 
-<p>Relays are used to temporarily hold messages in case your device is offline.
-Relays are cheap and dumb servers,
-that do not store data as group states, your name or avatar -
-all that exist only on your device.
-Relays are operated by different groups and people.</p>
+<p>We would like to improve Delta Chat with your help,
+which is why Delta Chat for Android asks whether you want
+to send anonymous usage statistics.</p>
 
-<p>By default, after installation, a relay is <strong>automatically set up</strong>,
-so you do not need to care about that.
-However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+<p>You can turn it on and off at
+<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
+
+<p>When you turn it on,
+weekly statistics will be automatically sent to a bot.</p>
+
+<p>We are interested e.g. in statistics like:</p>
 
 <ul>
-  <li>
-    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
-  </li>
-  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
-  </li>
-  <li>
-    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
-  </li>
+  <li>How many contacts are introduced by personally scanning a QR code?</li>
+  <li>Which versions of Delta Chat are being used?</li>
+  <li>How many messages are unencrypted?</li>
 </ul>
 
-<p>For more details and future possibilities of relays,
-you can follow discussions in the <a href="https://support.delta.chat">Forum</a>.</p>
+<p>We will <em>not</em> collect any personally identifiable information about you.</p>
     
       <h3 id="can-i-use-a-classic-email-address-with-delta-chat">
         
@@ -988,7 +972,7 @@ while chatmail apps and relays pervasively enforce end-to-end encryption and sec
   </li>
   <li>
     <p>Non-chatmail apps use email servers as a long-term message archive
-while chatmail clients use email servers for ephemeral instant message relay.</p>
+while chatmail clients use email servers for ephemeral instant message transport.</p>
   </li>
   <li>
     <p>Supporting the full variety of classic email setups
@@ -1000,7 +984,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
       <h3 id="classic-email">
         
         
-          How can I configure a chat profile with a classic email address as relay? <a href="#classic-email" class="anchor"></a>
+          How can I configure a chat profile with a classic email address as transport? <a href="#classic-email" class="anchor"></a>
         
         
       </h3>
@@ -1009,7 +993,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
 unless you are prepared to deal with encrypted messages in the inbox,
 double notifications, accidentally deleted emails or similar annoyances.</p>
 
-<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Relay</strong>.
+<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Transport</strong>.
 Note that classic email providers will generally not support <a href="#instant-delivery">Push Notifications</a>
 and have other limitations, see <a href="https://providers.delta.chat">Provider Overview</a>.
 Chatmail uses the default INBOX for relay; ensure the provider setup does too. 
@@ -1033,40 +1017,6 @@ except if your users’ devices require Google/Apple <a href="#instant-delivery"
 and <a href="https://github.com/chatmail/core">core Rust developments</a> 
 that power <a href="https://chatmail.at/clients">chatmail clients</a> of which Delta Chat is the most well known.</p>
     
-      <h3 id="statssending">
-        
-        
-          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>We would like to improve Delta Chat with your help,
-which is why Delta Chat for Android asks whether you want
-to send anonymous usage statistics.</p>
-
-<p>You can turn it on and off at
-<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
-
-<p>When you turn it on,
-weekly statistics will be automatically sent to a bot.</p>
-
-<p>We are interested e.g. in statistics like:</p>
-
-<ul>
-  <li>
-    <p>How many contacts are introduced by personally scanning a QR code?</p>
-  </li>
-  <li>
-    <p>Which versions of Delta Chat are being used?</p>
-  </li>
-  <li>
-    <p>What errors occur for users?</p>
-  </li>
-</ul>
-
-<p>We will <em>not</em> collect any personally identifiable information about you.</p>
-    
       <h3 id="interesują-mnie-szczegóły-techniczne-możesz-powiedzieć-mi-coś-więcej">
         
         
@@ -1075,7 +1025,9 @@ weekly statistics will be automatically sent to a bot.</p>
         
       </h3>
 
-<p>Zobacz <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Standardy używane w Delta Chat</a>.</p>
+<ul>
+  <li>Zobacz <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Standardy używane w Delta Chat</a>.</li>
+</ul>
     
       <h2 id="e2ee">
         
@@ -1262,32 +1214,6 @@ with the knowledge that all their data, along with all metadata, will be deleted
 Moreover, if a device is seized then chat contacts using short-lived profiles
 can not be identified easily.</p>
     
-      <h3 id="who-sees-my-ip-address">
-        
-        
-          Who sees my IP Address? <a href="#who-sees-my-ip-address" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>The used <a href="#relays">relay</a> needs to know your IP Address,
-as well as sometimes your contact’s devices if you have a <a href="#experiments">call</a>
-or use <a href="#webxdc">apps</a> together.</p>
-
-<p>IP Addresses are needed for connectivity and efficiency.
-They are neither persisted nor exposed.
-Note that the IP Address
-is not like a detailed address you give to a delivery service,
-but much more coarse, often defining region or country only.</p>
-
-<p>As this is just how the internet and other messengers work by default,
-we do not offer options here or ask upfront questions.</p>
-
-<p>If you see your IP Address as a security or privacy risk,
-we recommend to use a VPN, in combination with system lockdown mode.
-Hunting down options in all apps on your system will leave gaps.
-For example, tapping a link exposes IP Addresses to unknown parties and is the by far larger risk here.</p>
-    
       <h3 id="sealedsender">
         
         
@@ -1352,12 +1278,9 @@ but an implementation has not been agreed as a priority yet.</p>
 
 <p>Nie.</p>
 
-<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1.
-We do not recommend or offer users to perform manual key management.
-We want to ensure that security audits can focus on a few proven cryptographic algorithms
-instead of the full breadth of possible algorithms allowed with OpenPGP.
-If you want to extract your OpenPGP key, there only is an expert method:
-you need to look it up in the “keypairs” SQLite table of a profile backup tar-file.</p>
+<p>Delta Chat generuje bezpieczne klucze OpenPGP zgodnie ze specyfikacją Autocrypt 1.1. Możesz wyeksportować swój prywatny klucz, ale nie możesz zaimportować dodatkowych kluczy prywatnych.</p>
+
+<p>Generalnie nie zalecamy ani nie oferujemy użytkownikom wykonywania ręcznego zarządzania kluczami. Chcemy się upewnić, że audyty bezpieczeństwa mogą skupić się na kilku sprawdzonych algorytmach kryptograficznych, a nie na pełnym zakresie możliwych algorytmów dozwolonych w OpenPGP.</p>
     
       <h3 id="security-audits">
         
@@ -1463,35 +1386,31 @@ Raczej korzystamy z publicznych źródeł finansowania, jak dotąd pochodzących
 
 <ul>
   <li>
-    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
-program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
-along with collaboration partners working on
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>,
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>,
-<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and
-<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>.
-All of these projects are partially completed or to be completed in early 2025.</p>
+    <p>Unijny projekt <a href="https://nextleap.eu">NEXTLEAP</a> sfinansował badania i wdrożenie zweryfikowanych grup i ustawień protokołów kontaktowych w latach 2017 i 2018, a także pomógł zintegrować szyfrowanie end-to-end poprzez <a href="https://autocrypt.org">Autocrypt</a>.</p>
+  </li>
+  <li>
+    <p><a href="https://opentechfund.org">Open Technology Fund</a> przyznał nam pierwszy grant w 2018/2019 (~200 000 $), dzięki któremu znacznie ulepszyliśmy aplikację na Androida i wydaliśmy pierwszą wersję beta aplikacji na komputery stacjonarne, a także ugruntował rozwój naszych funkcji w badaniach UX w kontekście praw człowieka, zobacz nasz końcowy raport <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX</a>.
+Druga dotacja w 2019/2020 (~300 000 4) pomogła nam wydać wersje Delta/iOS, przekonwertować naszą podstawową bibliotekę na Rust i zapewnić nowe funkcje dla wszystkich platform.</p>
+  </li>
+  <li>
+    <p><a href="https://nlnet.nl/">Fundacja NLnet</a> przekazała w latach 2019/2020 kwotę 46 tys. EUR na wykonanie wiązań Rust/Python i uruchomienie ekosystemu Chat-bot.</p>
   </li>
   <li>
     <p>In 2021 we received further EU funding for two Next-Generation-Internet
 proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
   </li>
   <li>
-    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
-completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
+    <p>From End 2021 till March 2023 we received <em>Internet Freedom</em> funding (500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supported our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of email servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
   </li>
   <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p>W latach 2023-2024 pomyślnie ukończyliśmy finansowany przez OTF <a href="https://www.opentech.fund/projects-we-support/supported-projects/secure-chat-mail-with-delta-chat/">projekt Secure Chatmail</a>, co pozwoliło nam wprowadzić gwarantowane szyfrowanie, stworzyć <a href="https://delta.chat/chatmail">sieć serwerów chatmail</a> i zapewnić „natychmiastowe wdrażanie” we wszystkich aplikacjach wydanych od kwietnia 2024 r.</p>
   </li>
   <li>
-    <p>Unijny projekt <a href="https://nextleap.eu">NEXTLEAP</a> sfinansował badania i wdrożenie zweryfikowanych grup i ustawień protokołów kontaktowych w latach 2017 i 2018, a także pomógł zintegrować szyfrowanie end-to-end poprzez <a href="https://autocrypt.org">Autocrypt</a>.</p>
+    <p>W latach 2023 i 2024 zostaliśmy przyjęci do programu Next Generation Internet (NGI) za naszą pracę w <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>, wraz z partnerami współpracującymi pracującymi nad <a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>, <a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>, <a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> i <a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>. Wszystkie te projekty są częściowo ukończone lub zostaną ukończone na początku 2025 r.</p>
   </li>
   <li>
     <p>Czasami otrzymujemy jednorazowe darowizny od osób prywatnych. Na przykład w 2021 roku pewna hojna osoba przekazała nam 4K EUR w formie przelewu bankowego tytułem “kontynuujcie dobry rozwój!”. 💜 Takie pieniądze przeznaczamy na finansowanie spotkań rozwojowych lub na doraźne wydatki, których nie da się łatwo przewidzieć lub zrefundować z publicznych dotacji. Otrzymywanie większej ilości darowizn pomaga nam również stać się bardziej niezależnymi i długoterminowo rentownymi jako społeczność współpracowników.</p>

src/main/assets/help/sk/help.html

@@ -15,7 +15,7 @@
       <li><a href="#čo-znamenajú-zaškrtnutia-zobrazené-vedľa-odchádzajúcich-správ">Čo znamenajú zaškrtnutia zobrazené vedľa odchádzajúcich správ?</a></li>
       <li><a href="#edit">Correct typos and delete messages after sending</a></li>
       <li><a href="#ephemeralmsgs">How do disappearing messages work?</a></li>
-      <li><a href="#delold">What happens if I turn on “Delete Messages from Device”?</a></li>
+      <li><a href="#delold">What happens if I turn on “Delete old messages from device”?</a></li>
       <li><a href="#remove-account">How can I delete my chat profile?</a></li>
     </ul>
   </li>
@@ -26,7 +26,6 @@
       <li><a href="#omylom-som-sa-vymazal">Omylom som sa vymazal.</a></li>
       <li><a href="#už-viac-nechcem-dostávať-správy-od-skupiny">Už viac nechcem dostávať správy od skupiny.</a></li>
       <li><a href="#cloning-a-group">Cloning a group</a></li>
-      <li><a href="#how-many-members-can-participate-in-a-single-group">How many members can participate in a single group?</a></li>
     </ul>
   </li>
   <li><a href="#webxdc">In-chat apps</a>
@@ -55,12 +54,11 @@
   </li>
   <li><a href="#advanced">Advanced</a>
     <ul>
-      <li><a href="#experiments">Experimental Features</a></li>
-      <li><a href="#relays">What are Relays?</a></li>
-      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
-      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as relay?</a></li>
-      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
+      <li><a href="#experimental-features">Experimental Features</a></li>
       <li><a href="#statssending">What is “Send statistics to Delta Chat’s developers”?</a></li>
+      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
+      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as transport?</a></li>
+      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
       <li><a href="#zaujímajú-ma-technické-detaily-môžete-mi-povedať-viac">Zaujímajú ma technické detaily. Môžete mi povedať viac?</a></li>
     </ul>
   </li>
@@ -77,7 +75,6 @@
       <li><a href="#tls">Are messages marked with the mail icon exposed on the Internet?</a></li>
       <li><a href="#message-metadata">How does Delta Chat protect metadata in messages?</a></li>
       <li><a href="#device-seizure">How to protect metadata and contacts when a device is seized?</a></li>
-      <li><a href="#who-sees-my-ip-address">Who sees my IP Address?</a></li>
       <li><a href="#sealedsender">Does Delta Chat support “Sealed Sender”?</a></li>
       <li><a href="#pfs">Does Delta Chat support Perfect Forward Secrecy?</a></li>
       <li><a href="#pqc">Does Delta Chat support Post-Quantum-Cryptography?</a></li>
@@ -187,8 +184,7 @@ If you add each other to <a href="#groups">groups</a>, end-to-end encryption wil
 <p>As being a private messenger,
 only friends and family you <a href="#howtoe2ee">share your QR code or invite link with</a> can write to you.</p>
 
-<p>Your friends may share your contact with other friends,
-this appears as <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Request</b></p>
+<p>Your friends may share your contact with other friends, this appears as a <strong>request</strong>.</p>
 
 <ul>
   <li>
@@ -226,10 +222,15 @@ and can tap it to start chatting with the first contact.</p>
         
       </h3>
 
-<p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
+<ul>
+  <li>
+    <p>Yes. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
 or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>For performance, images are optimized and sent at a smaller size by default, but you can send it as a “file” to preserve the original.</p>
+  </li>
+  <li>
+    <p>For performance, images are optimized and sent at a smaller size by default, but you can send it as a “file” to preserve the original.</p>
+  </li>
+</ul>
     
       <h3 id="multiple-accounts">
         
@@ -260,11 +261,16 @@ or to <strong>Switch Profiles</strong>.</p>
         
       </h3>
 
-<p>V nastaveniach si môžete pridať profilový obrázok. Ak napíšete svojim kontaktom
+<ul>
+  <li>
+    <p>V nastaveniach si môžete pridať profilový obrázok. Ak napíšete svojim kontaktom
 alebo si ich pridáte pomocou QR kódu, automaticky to vidia ako váš profilový obrázok.</p>
-
-<p>Z dôvodu ochrany osobných údajov nikto nevidí váš profilový obrázok, kým im nenapíšete
+  </li>
+  <li>
+    <p>Z dôvodu ochrany osobných údajov nikto nevidí váš profilový obrázok, kým im nenapíšete
 správu.</p>
+  </li>
+</ul>
     
       <h3 id="signature">
         
@@ -298,8 +304,7 @@ they will see it when they view your contact details.</p>
   </li>
   <li>
     <p><strong>Archive chats</strong> if you do not want to see them in your chat list any longer.
-They remain accessible above the chat list or via search
-and are marked by <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Archived</b></p>
+Archived chats remain accessible above the chat list or via search.</p>
   </li>
   <li>
     <p>When an archived chat gets a new message, unless muted, it will <strong>pop out of the archive</strong> and back into your chat list.
@@ -334,7 +339,7 @@ By tapping <img style="vertical-align:middle; width:1.2em; margin:1px" src="../g
 you can go back to the original message in the original chat</p>
   </li>
   <li>
-    <p>Finally, you can also use “Saved Messages” to take <strong>personal notes</strong> - open the chat, type something, add a photo or a voice message etc.</p>
+    <p>Finally, you can also use “Save Messages” to take <strong>personal notes</strong> - open the chat, type something, add a photo or a voice message etc.</p>
   </li>
   <li>
     <p>As “Saved Message” are synced, they can become very handy for transferring data between devices</p>
@@ -371,18 +376,22 @@ and others will as well not always see that you are “online”.</p>
 <ul>
   <li>
     <p><strong>One tick</strong> <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick1.png" alt="" />
-means that the message was sent successfully to the <a href="#relays">relay</a>.</p>
+means that the message was sent successfully to your provider.</p>
   </li>
   <li>
     <p><strong>Two ticks</strong>  <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick2.png" alt="" />
-indicate your contact has read the message.</p>
+mean that at least one recipient’s device
+reported back to having received the message.</p>
+  </li>
+  <li>
+    <p>Recipients may have disabled read-receipts,
+so even if you see only one tick, the message may have been read.</p>
+  </li>
+  <li>
+    <p>The other way round, two ticks do not automatically mean
+that a human has read or understood the message ;)</p>
   </li>
 </ul>
-
-<p>In <a href="#groups">groups</a> the second tick means that at least one member has reported back having read the message.</p>
-
-<p>You will only get the second tick if both you and one of the recipients who read the message
-has <strong>Settings → Chats → Read Receipts</strong> enabled.</p>
     
       <h3 id="edit">
         
@@ -447,18 +456,19 @@ the (anyway encrypted) messages may take longer to get deleted from their server
       <h3 id="delold">
         
         
-          What happens if I turn on “Delete Messages from Device”? <a href="#delold" class="anchor"></a>
+          What happens if I turn on “Delete old messages from device”? <a href="#delold" class="anchor"></a>
         
         
       </h3>
 
-<p>If you want to save storage on your device, you can choose to delete old
-messages automatically.</p>
-
-<p>To turn it on, go to <strong>Settings → Chats → Delete Message from Device</strong>.
-You can set a timeframe between “after an hour” and “after a year”;
+<ul>
+  <li>If you want to save storage on your device, you can choose to delete old
+messages automatically.</li>
+  <li>To turn it on, go to “delete old messages from device” in the “Chats &amp; Media”
+settings. You can set a timeframe between “after an hour” and “after a year”;
 this way, <em>all</em> messages will be deleted from your device as soon as they are
-older than that.</p>
+older than that.</li>
+</ul>
     
       <h3 id="remove-account">
         
@@ -506,15 +516,9 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
       </h3>
 
 <ul>
-  <li>
-    <p>Vyberte <strong>Nový chat</strong> a potom <strong>Nová skupina</strong> z ponuky v pravom hornom rohu alebo stlačte príslušné tlačidlo v systéme Android/iOS.</p>
-  </li>
-  <li>
-    <p>Na nasledujúcej obrazovke vyberte <strong>členov skupiny</strong> a definujte <strong>názov skupiny</strong>. Môžete si tiež vybrať <strong>avatara skupiny</strong>.</p>
-  </li>
-  <li>
-    <p>Hneď ako napíšete <strong>prvú správu</strong> v skupine, všetci členovia sú informovaní o novej skupine a môžu odpovedať v skupine (pokiaľ nenapíšete správu v skupine, skupina je pre skupinu neviditeľná členovia).</p>
-  </li>
+  <li>Vyberte <strong>Nový chat</strong> a potom <strong>Nová skupina</strong> z ponuky v pravom hornom rohu alebo stlačte príslušné tlačidlo v systéme Android/iOS.</li>
+  <li>Na nasledujúcej obrazovke vyberte <strong>členov skupiny</strong> a definujte <strong>názov skupiny</strong>. Môžete si tiež vybrať <strong>avatara skupiny</strong>.</li>
+  <li>Hneď ako napíšete <strong>prvú správu</strong> v skupine, všetci členovia sú informovaní o novej skupine a môžu odpovedať v skupine (pokiaľ nenapíšete správu v skupine, skupina je pre skupinu neviditeľná členovia).</li>
 </ul>
     
       <h3 id="addmembers">
@@ -525,10 +529,11 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
         
       </h3>
 
-<p>All group members have the <strong>same rights</strong>.
-For this reason, everyone can delete any member or add new ones.</p>
-
 <ul>
+  <li>
+    <p>All group members have the <strong>same rights</strong>.
+For this reason, everyone can delete any member or add new ones.</p>
+  </li>
   <li>
     <p>To <strong>add or delete members</strong>, tap the group name in the chat and select the member to add or remove.</p>
   </li>
@@ -556,8 +561,10 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
         
       </h3>
 
-<p>Keďže už nie ste členom skupiny, nemôžete sa znova pridať. 
-  Žiadny problém, jednoducho požiadajte ktoréhokoľvek iného člena skupiny v bežnom chate, aby vás znova pridal.</p>
+<ul>
+  <li>Keďže už nie ste členom skupiny, nemôžete sa znova pridať. 
+Žiadny problém, jednoducho požiadajte ktoréhokoľvek iného člena skupiny v bežnom chate, aby vás znova pridal.</li>
+</ul>
     
       <h3 id="už-viac-nechcem-dostávať-správy-od-skupiny">
         
@@ -568,12 +575,15 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
       </h3>
 
 <ul>
-  <li>Vymažte sa zo zoznamu členov alebo odstráňte celý chat.
- Ak sa chcete neskôr znova pripojiť k skupine, požiadajte iného člena skupiny, aby vás znova pridal.</li>
-</ul>
-
-<p>Ako alternatívu môžete tiež “Stlmiť” skupinu - znamená to, že budete dostávať všetky správy a
+  <li>
+    <p>Vymažte sa zo zoznamu členov alebo odstráňte celý chat.
+ Ak sa chcete neskôr znova pripojiť k skupine, požiadajte iného člena skupiny, aby vás znova pridal.</p>
+  </li>
+  <li>
+    <p>Ako alternatívu môžete tiež “Stlmiť” skupinu - znamená to, že budete dostávať všetky správy a
 môžete stále písať, ale už nebudete upozorňovaní na žiadne nové správy.</p>
+  </li>
+</ul>
     
       <h3 id="cloning-a-group">
         
@@ -599,21 +609,6 @@ or right-click the group in the chat list (Desktop).</p>
 <p>The new group is <strong>fully independent</strong> from the original,
 which continues to work as before.</p>
     
-      <h3 id="how-many-members-can-participate-in-a-single-group">
-        
-        
-          How many members can participate in a single group? <a href="#how-many-members-can-participate-in-a-single-group" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>There is no strict technical limit,
-but more than 150 is not recommended.</p>
-
-<p>As groups get larger, they can become socially unstable and may need a hierarchy -
-where Delta Chat is a private messenger for chatting with <a href="#groups">equal rights</a>.
-See <a href="https://en.wikipedia.org/wiki/Dunbar%27s_number">Dunbar’s number</a> for more insights.</p>
-    
       <h2 id="webxdc">
         
         
@@ -655,7 +650,7 @@ This makes Delta Chat a truly extensible messenger.</p>
     <p>In-chat apps can not send data to the Internet, or download anything.</p>
   </li>
   <li>
-    <p>An in-chat app can only exchange data within a chat, with its
+    <p>An in-chat app can only exchange data within a Delta Chat chat, with its
 copies on the devices of your chat partners. Other than that, it’s completely
 isolated from the Internet.</p>
   </li>
@@ -902,7 +897,7 @@ One device is not needed for the other to work.</p>
     <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
   </li>
   <li>
-    <p>On <strong>Windows</strong>, go to “Control Panel / Network and Internet”
+    <p>On <strong>Windows</strong>, go to <strong>Control Panel / Network and Internet</strong>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
@@ -954,21 +949,22 @@ try the <strong>manual transfer</strong> described below</p>
 <p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
-  <li>
-    <p>On the old device, go to <strong>Settings → Chats → Export Backup</strong>. Enter your
+  <li>On the old device, go to “Settings -&gt; Chats and media -&gt; Export Backup”. Enter your
 screen unlock PIN, pattern, or password. Then you can click on “Start
 Backup”. This saves the backup file to your device. Now you have to transfer
-it to the other device somehow.</p>
-  </li>
-  <li>
-    <p>On the new device, select <strong>I Already Have a Profile → Restore from Backup</strong>.
-If you use iOS and encounter difficulties,
-<a href="https://support.delta.chat/t/import-backup-to-ios/1628">this guide</a> might help you.</p>
+it to the other device somehow.</li>
+  <li>On the new device, in the “I already have a profile” menu,
+choose “restore from backup”. After import, your conversations, encryption
+keys, and media should be copied to the new device.
+    <ul>
+      <li><strong>If you use iOS:</strong> and you encounter difficulties, maybe
+<a href="https://support.delta.chat/t/import-backup-to-ios/1628">this guide</a> will
+help you.</li>
+    </ul>
   </li>
+  <li>You are now synchronized, and can use both devices for sending and receiving
+end-to-end encrypted messages with your communication partners.</li>
 </ul>
-
-<p>You are now synchronized, and can use both devices for sending and receiving
-end-to-end encrypted messages with your communication partners.</p>
     
       <h3 id="máte-nejaké-plány-na-zavedenie-webového-klienta-delta-chat">
         
@@ -997,10 +993,10 @@ alebo AppImage pre Linux. Nájdete ich na
         
       </h2>
     
-      <h3 id="experiments">
+      <h3 id="experimental-features">
         
         
-          Experimental Features <a href="#experiments" class="anchor"></a>
+          Experimental Features <a href="#experimental-features" class="anchor"></a>
         
         
       </h3>
@@ -1013,44 +1009,33 @@ you can try out features we are working on.</p>
 <p>You can find more information
 and give feedback in the <a href="https://support.delta.chat">Forum</a>.</p>
     
-      <h3 id="relays">
+      <h3 id="statssending">
         
         
-          What are Relays? <a href="#relays" class="anchor"></a>
+          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
         
         
       </h3>
 
-<p>Relays are used to temporarily hold messages in case your device is offline.
-Relays are cheap and dumb servers,
-that do not store data as group states, your name or avatar -
-all that exist only on your device.
-Relays are operated by different groups and people.</p>
+<p>We would like to improve Delta Chat with your help,
+which is why Delta Chat for Android asks whether you want
+to send anonymous usage statistics.</p>
 
-<p>By default, after installation, a relay is <strong>automatically set up</strong>,
-so you do not need to care about that.
-However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+<p>You can turn it on and off at
+<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
+
+<p>When you turn it on,
+weekly statistics will be automatically sent to a bot.</p>
+
+<p>We are interested e.g. in statistics like:</p>
 
 <ul>
-  <li>
-    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
-  </li>
-  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
-  </li>
-  <li>
-    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
-  </li>
+  <li>How many contacts are introduced by personally scanning a QR code?</li>
+  <li>Which versions of Delta Chat are being used?</li>
+  <li>How many messages are unencrypted?</li>
 </ul>
 
-<p>For more details and future possibilities of relays,
-you can follow discussions in the <a href="https://support.delta.chat">Forum</a>.</p>
+<p>We will <em>not</em> collect any personally identifiable information about you.</p>
     
       <h3 id="can-i-use-a-classic-email-address-with-delta-chat">
         
@@ -1072,7 +1057,7 @@ while chatmail apps and relays pervasively enforce end-to-end encryption and sec
   </li>
   <li>
     <p>Non-chatmail apps use email servers as a long-term message archive
-while chatmail clients use email servers for ephemeral instant message relay.</p>
+while chatmail clients use email servers for ephemeral instant message transport.</p>
   </li>
   <li>
     <p>Supporting the full variety of classic email setups
@@ -1084,7 +1069,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
       <h3 id="classic-email">
         
         
-          How can I configure a chat profile with a classic email address as relay? <a href="#classic-email" class="anchor"></a>
+          How can I configure a chat profile with a classic email address as transport? <a href="#classic-email" class="anchor"></a>
         
         
       </h3>
@@ -1093,7 +1078,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
 unless you are prepared to deal with encrypted messages in the inbox,
 double notifications, accidentally deleted emails or similar annoyances.</p>
 
-<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Relay</strong>.
+<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Transport</strong>.
 Note that classic email providers will generally not support <a href="#instant-delivery">Push Notifications</a>
 and have other limitations, see <a href="https://providers.delta.chat">Provider Overview</a>.
 Chatmail uses the default INBOX for relay; ensure the provider setup does too. 
@@ -1117,40 +1102,6 @@ except if your users’ devices require Google/Apple <a href="#instant-delivery"
 and <a href="https://github.com/chatmail/core">core Rust developments</a> 
 that power <a href="https://chatmail.at/clients">chatmail clients</a> of which Delta Chat is the most well known.</p>
     
-      <h3 id="statssending">
-        
-        
-          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>We would like to improve Delta Chat with your help,
-which is why Delta Chat for Android asks whether you want
-to send anonymous usage statistics.</p>
-
-<p>You can turn it on and off at
-<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
-
-<p>When you turn it on,
-weekly statistics will be automatically sent to a bot.</p>
-
-<p>We are interested e.g. in statistics like:</p>
-
-<ul>
-  <li>
-    <p>How many contacts are introduced by personally scanning a QR code?</p>
-  </li>
-  <li>
-    <p>Which versions of Delta Chat are being used?</p>
-  </li>
-  <li>
-    <p>What errors occur for users?</p>
-  </li>
-</ul>
-
-<p>We will <em>not</em> collect any personally identifiable information about you.</p>
-    
       <h3 id="zaujímajú-ma-technické-detaily-môžete-mi-povedať-viac">
         
         
@@ -1159,7 +1110,9 @@ weekly statistics will be automatically sent to a bot.</p>
         
       </h3>
 
-<p>Pozrite si <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Štandardy používané v Delta Chate</a>.</p>
+<ul>
+  <li>Pozrite si <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Štandardy používané v Delta Chate</a>.</li>
+</ul>
     
       <h2 id="e2ee">
         
@@ -1398,32 +1351,6 @@ with the knowledge that all their data, along with all metadata, will be deleted
 Moreover, if a device is seized then chat contacts using short-lived profiles
 can not be identified easily.</p>
     
-      <h3 id="who-sees-my-ip-address">
-        
-        
-          Who sees my IP Address? <a href="#who-sees-my-ip-address" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>The used <a href="#relays">relay</a> needs to know your IP Address,
-as well as sometimes your contact’s devices if you have a <a href="#experiments">call</a>
-or use <a href="#webxdc">apps</a> together.</p>
-
-<p>IP Addresses are needed for connectivity and efficiency.
-They are neither persisted nor exposed.
-Note that the IP Address
-is not like a detailed address you give to a delivery service,
-but much more coarse, often defining region or country only.</p>
-
-<p>As this is just how the internet and other messengers work by default,
-we do not offer options here or ask upfront questions.</p>
-
-<p>If you see your IP Address as a security or privacy risk,
-we recommend to use a VPN, in combination with system lockdown mode.
-Hunting down options in all apps on your system will leave gaps.
-For example, tapping a link exposes IP Addresses to unknown parties and is the by far larger risk here.</p>
-    
       <h3 id="sealedsender">
         
         
@@ -1510,12 +1437,12 @@ the connection is safe.</p>
 
 <p>No.</p>
 
-<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1.
-We do not recommend or offer users to perform manual key management.
-We want to ensure that security audits can focus on a few proven cryptographic algorithms
-instead of the full breadth of possible algorithms allowed with OpenPGP.
-If you want to extract your OpenPGP key, there only is an expert method:
-you need to look it up in the “keypairs” SQLite table of a profile backup tar-file.</p>
+<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1. 
+You can export your private key but you can not import additional private keys.</p>
+
+<p>In general, we do not recommend or offer users to perform manual key management. 
+We want to ensure that security audits can focus on a few proven cryptographic algorithms 
+instead of the full breadth of possible algorithms allowed with OpenPGP.</p>
     
       <h3 id="security-audits">
         
@@ -1663,38 +1590,52 @@ ordered chronologically:</p>
 
 <ul>
   <li>
-    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
-program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
-along with collaboration partners working on
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>,
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>,
-<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and
-<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>.
-All of these projects are partially completed or to be completed in early 2025.</p>
+    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
+and implementation of verified groups and setup contact protocols
+in 2017 and 2018 and also helped to integrate end-to-end Encryption
+through <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p>In 2021 we received further EU funding for two Next-Generation-Internet
-proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a 
+first 2018/2019 grant (~$200K) during which we majorly improved the Android app 
+and released a first Desktop app beta version, and which moreover 
+moored our feature developments in UX research in human rights contexts, 
+see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
+The second 2019/2020 grant (~$300K) helped us to 
+release Delta/iOS versions, to convert our core library to Rust, and
+to provide new features for all platforms.</p>
   </li>
   <li>
     <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
 completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
   </li>
   <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p>In 2021 we received further EU funding for two Next-Generation-Internet
+proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
   </li>
   <li>
-    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
-and implementation of verified groups and setup contact protocols
-in 2017 and 2018 and also helped to integrate end-to-end Encryption
-through <a href="https://autocrypt.org">Autocrypt</a>.</p>
+    <p>From End 2021 till March 2023 we received <em>Internet Freedom</em> funding (500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supported our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of email servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
+  </li>
+  <li>
+    <p>2023-2024 we successfully completed the OTF-funded 
+<a href="https://www.opentech.fund/projects-we-support/supported-projects/secure-chat-mail-with-delta-chat/">Secure Chatmail project</a>, 
+allowing us to introduce guaranteed encryption, 
+creating a <a href="https://delta.chat/chatmail">chatmail server network</a> 
+and providing “instant onboarding” in all apps released from April 2024 on.</p>
+  </li>
+  <li>
+    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
+program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
+along with collaboration partners working on 
+<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>, 
+<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>, 
+<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and 
+<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>. 
+All of these projects are partially completed or to be completed in early 2025.</p>
   </li>
   <li>
     <p>Sometimes we receive one-time donations from private individuals. 

src/main/assets/help/sq/help.html

@@ -26,7 +26,6 @@
       <li><a href="#fshiva-veten-padashje">Fshiva veten padashje.</a></li>
       <li><a href="#sdua-ti-marr-më-mesazhet-e-një-grupi">S’dua t’i marr më mesazhet e një grupi.</a></li>
       <li><a href="#cloning-a-group">Cloning a group</a></li>
-      <li><a href="#how-many-members-can-participate-in-a-single-group">How many members can participate in a single group?</a></li>
     </ul>
   </li>
   <li><a href="#webxdc">In-chat apps</a>
@@ -55,12 +54,11 @@
   </li>
   <li><a href="#advanced">Advanced</a>
     <ul>
-      <li><a href="#experiments">Experimental Features</a></li>
-      <li><a href="#relays">What are Relays?</a></li>
-      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
-      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as relay?</a></li>
-      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
+      <li><a href="#experimental-features">Experimental Features</a></li>
       <li><a href="#statssending">What is “Send statistics to Delta Chat’s developers”?</a></li>
+      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
+      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as transport?</a></li>
+      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
       <li><a href="#më-interesojnë-hollësitë-teknike-mund-të-më-tregoni-diçka-më-tepër">Më interesojnë hollësitë teknike. Mund të më tregoni diçka më tepër?</a></li>
     </ul>
   </li>
@@ -77,7 +75,6 @@
       <li><a href="#tls">Are messages marked with the mail icon exposed on the Internet?</a></li>
       <li><a href="#message-metadata">Si i mbron Delta Chat-i tejtëdhënat në mesazhe?</a></li>
       <li><a href="#device-seizure">Si të mbrohen tejtëdhënat dhe kontaktet, kur shtien në dorë një pajisje?</a></li>
-      <li><a href="#who-sees-my-ip-address">Who sees my IP Address?</a></li>
       <li><a href="#sealedsender">Does Delta Chat support “Sealed Sender”?</a></li>
       <li><a href="#pfs">Does Delta Chat support Perfect Forward Secrecy?</a></li>
       <li><a href="#pqc">Does Delta Chat support Post-Quantum-Cryptography?</a></li>
@@ -187,8 +184,7 @@ If you add each other to <a href="#groups">groups</a>, end-to-end encryption wil
 <p>As being a private messenger,
 only friends and family you <a href="#howtoe2ee">share your QR code or invite link with</a> can write to you.</p>
 
-<p>Your friends may share your contact with other friends,
-this appears as <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Request</b></p>
+<p>Your friends may share your contact with other friends, this appears as a <strong>request</strong>.</p>
 
 <ul>
   <li>
@@ -226,10 +222,15 @@ and can tap it to start chatting with the first contact.</p>
         
       </h3>
 
-<p>Po Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
+<ul>
+  <li>
+    <p>Po Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
 or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>Si parazgjedhje, për funksionim më të mirë, figurat optimizohen dhe dërgohen në madhësi më të vogël, por mund ta dërgoni si një “kartelë”, që të ruhet origjinali.</p>
+  </li>
+  <li>
+    <p>Si parazgjedhje, për funksionim më të mirë, figurat optimizohen dhe dërgohen në madhësi më të vogël, por mund ta dërgoni si një “kartelë”, që të ruhet origjinali.</p>
+  </li>
+</ul>
     
       <h3 id="multiple-accounts">
         
@@ -260,11 +261,16 @@ or to <strong>Switch Profiles</strong>.</p>
         
       </h3>
 
-<p>Mund të shtoni një foto profili te rregullimet tuaja. Nëse u shkruani kontakteve
-  tuaja ose i shtoni përmes kodi QR, e shohin automatikisht si foton e profilit tuaj.</p>
-
-<p>Për arsye privatësie, askush s’e sheh foton tuaj të profilit, deri sa
-   t’u shkruani një mesazh.</p>
+<ul>
+  <li>
+    <p>Mund të shtoni një foto profili te rregullimet tuaja. Nëse u shkruani kontakteve
+tuaja ose i shtoni përmes kodi QR, e shohin automatikisht si foton e profilit tuaj.</p>
+  </li>
+  <li>
+    <p>Për arsye privatësie, askush s’e sheh foton tuaj të profilit, deri sa
+ t’u shkruani një mesazh.</p>
+  </li>
+</ul>
     
       <h3 id="signature">
         
@@ -297,7 +303,8 @@ they will see it when they view your contact details.</p>
     <p><strong>Heshtoni fjalosje</strong>, nëse s’doni të merrni njoftime mbi to. Fjalosjet e heshtuara qëndrojnë në vend dhe mundeni edhe të fiksoni një fjalosje të heshtuar.</p>
   </li>
   <li>
-    <p><strong>Arkivoni fjalosje</strong>, nëse s’doni t’i shihni më në listën tuaj të fjalosjeve. Fjalosjet e arkivuara mbesin të përdorshme mbi listën e fjalosjeve, ose përmes kërkimit.</p>
+    <p><strong>Arkivoni fjalosje</strong>, nëse s’doni t’i shihni më në listën tuaj të fjalosjeve.
+Fjalosjet e arkivuara mbesin të përdorshme mbi listën e fjalosjeve, ose përmes kërkimit.</p>
   </li>
   <li>
     <p>Kur te një fjalosje e arkivuar vjen një mesazh i ri, do të <strong>hapet jashtë arkivit</strong> dhe kalojë te lista juaj e fjalosjeve, veç në mos qoftë e heshtuar.
@@ -333,7 +340,7 @@ By tapping <img style="vertical-align:middle; width:1.2em; margin:1px" src="../g
 you can go back to the original message in the original chat</p>
   </li>
   <li>
-    <p>Finally, you can also use “Saved Messages” to take <strong>personal notes</strong> - open the chat, type something, add a photo or a voice message etc.</p>
+    <p>Finally, you can also use “Save Messages” to take <strong>personal notes</strong> - open the chat, type something, add a photo or a voice message etc.</p>
   </li>
   <li>
     <p>As “Saved Message” are synced, they can become very handy for transferring data between devices</p>
@@ -370,18 +377,22 @@ and others will as well not always see that you are “online”.</p>
 <ul>
   <li>
     <p><strong>One tick</strong> <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick1.png" alt="" />
-means that the message was sent successfully to the <a href="#relays">relay</a>.</p>
+means that the message was sent successfully to your provider.</p>
   </li>
   <li>
     <p><strong>Two ticks</strong>  <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick2.png" alt="" />
-indicate your contact has read the message.</p>
+mean that at least one recipient’s device
+reported back to having received the message.</p>
+  </li>
+  <li>
+    <p>Recipients may have disabled read-receipts,
+so even if you see only one tick, the message may have been read.</p>
+  </li>
+  <li>
+    <p>The other way round, two ticks do not automatically mean
+that a human has read or understood the message ;)</p>
   </li>
 </ul>
-
-<p>In <a href="#groups">groups</a> the second tick means that at least one member has reported back having read the message.</p>
-
-<p>You will only get the second tick if both you and one of the recipients who read the message
-has <strong>Settings → Chats → Read Receipts</strong> enabled.</p>
     
       <h3 id="edit">
         
@@ -451,13 +462,14 @@ the (anyway encrypted) messages may take longer to get deleted from their server
         
       </h3>
 
-<p>Nëse doni të kurseni hapësirë në pajisjen tuaj, mund të zgjidhni të fshihen
-automatikisht mesazhe të vjetër.</p>
-
-<p>Për ta aktivizuar, kaloni te “fshi prej pajisjeje mesazhe të vjetër”, te rregullimet
+<ul>
+  <li>Nëse doni të kurseni hapësirë në pajisjen tuaj, mund të zgjidhni të fshihen
+automatikisht mesazhe të vjetër.</li>
+  <li>Për ta aktivizuar, kaloni te “fshi prej pajisjeje mesazhe të vjetër”, te rregullimet
 “Fjalosje &amp; Media”. Mund të caktoni një periudhë nga “pas një ore” e deri
 “pas një viti”; në këtë mënyrë, <em>krejt</em> mesazhet do të fshihen nga pajisja juaj
-sapo të jenë më të vjetër se aq.</p>
+sapo të jenë më të vjetër se aq.</li>
+</ul>
     
       <h3 id="remove-account">
         
@@ -505,15 +517,9 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
       </h3>
 
 <ul>
-  <li>
-    <p>Prej menusë në cepin e sipërm djathtas, përzgjidhni <strong>Fjalosje e re</strong> dhe mandej <strong>Grup i ri</strong>, ose shtypni butonin përgjegjës në Android/iOS.</p>
-  </li>
-  <li>
-    <p>Te skena vijuese, përzgjidhni <strong>anëtarë grupi</strong> dhe përcaktoni një <strong>emër grupi</strong>. Mund të përzgjidhni edhe një <strong>avatar grupi</strong>.</p>
-  </li>
-  <li>
-    <p>Sapo të shkruani <strong>mesazhin e parë</strong> te grupi, krejt anëtarët marrin vesh për grupin e ri dhe mund të përgjigjen në të (për sa kohë që te grupi s’shkruani një mesazh i cili është i padukshëm për anëtarët).</p>
-  </li>
+  <li>Prej menusë në cepin e sipërm djathtas, përzgjidhni <strong>Fjalosje e re</strong> dhe mandej <strong>Grup i ri</strong>, ose shtypni butonin përgjegjës në Android/iOS.</li>
+  <li>Te skena vijuese, përzgjidhni <strong>anëtarë grupi</strong> dhe përcaktoni një <strong>emër grupi</strong>. Mund të përzgjidhni edhe një <strong>avatar grupi</strong>.</li>
+  <li>Sapo të shkruani <strong>mesazhin e parë</strong> te grupi, krejt anëtarët marrin vesh për grupin e ri dhe mund të përgjigjen në të (për sa kohë që te grupi s’shkruani një mesazh i cili është i padukshëm për anëtarët).</li>
 </ul>
     
       <h3 id="addmembers">
@@ -524,10 +530,11 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
         
       </h3>
 
-<p>All group members have the <strong>same rights</strong>.
-For this reason, everyone can delete any member or add new ones.</p>
-
 <ul>
+  <li>
+    <p>All group members have the <strong>same rights</strong>.
+For this reason, everyone can delete any member or add new ones.</p>
+  </li>
   <li>
     <p>To <strong>add or delete members</strong>, tap the group name in the chat and select the member to add or remove.</p>
   </li>
@@ -555,8 +562,10 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
         
       </h3>
 
-<p>Ngaqë s’jeni më anëtar i grupit, s’mund të shtoni veten sërish. 
-  Megjithatë, s’ka problem, thjesht kërkojini një anëtari tjetër të grupit në një fjalosje të zakonshme t’ju shtojë sërish.</p>
+<ul>
+  <li>Ngaqë s’jeni më anëtar i grupit, s’mund të shtoni veten sërish. 
+Megjithatë, s’ka problem, thjesht kërkojini një anëtari tjetër të grupit në një fjalosje të zakonshme t’ju shtojë sërish.</li>
+</ul>
     
       <h3 id="sdua-ti-marr-më-mesazhet-e-një-grupi">
         
@@ -567,13 +576,16 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
       </h3>
 
 <ul>
-  <li>Ose fshini veten si anëtar i listës, ose fshini krejt bisedën. 
-Nëse më vonë doni të ribëheni pjesë e grupit, kërkojini një anëtari tjetër të grupit t’ju shtojë sërish.</li>
-</ul>
-
-<p>Ndryshe, mundeni edhe ta “Heshtoni” një grup - duke bërë këtë, do të merrni
+  <li>
+    <p>Ose fshini veten si anëtar i listës, ose fshini krejt bisedën. 
+Nëse më vonë doni të ribëheni pjesë e grupit, kërkojini një anëtari tjetër të grupit t’ju shtojë sërish.</p>
+  </li>
+  <li>
+    <p>Ndryshe, mundeni edhe ta “Heshtoni” një grup - duke bërë këtë, do të merrni
 krejt mesazhet dhe prapë mund të shkruani, por nuk njoftoheni më, 
 për çfarëdo mesazhesh të rinj.</p>
+  </li>
+</ul>
     
       <h3 id="cloning-a-group">
         
@@ -599,21 +611,6 @@ or right-click the group in the chat list (Desktop).</p>
 <p>The new group is <strong>fully independent</strong> from the original,
 which continues to work as before.</p>
     
-      <h3 id="how-many-members-can-participate-in-a-single-group">
-        
-        
-          How many members can participate in a single group? <a href="#how-many-members-can-participate-in-a-single-group" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>There is no strict technical limit,
-but more than 150 is not recommended.</p>
-
-<p>As groups get larger, they can become socially unstable and may need a hierarchy -
-where Delta Chat is a private messenger for chatting with <a href="#groups">equal rights</a>.
-See <a href="https://en.wikipedia.org/wiki/Dunbar%27s_number">Dunbar’s number</a> for more insights.</p>
-    
       <h2 id="webxdc">
         
         
@@ -655,7 +652,7 @@ This makes Delta Chat a truly extensible messenger.</p>
     <p>In-chat apps can not send data to the Internet, or download anything.</p>
   </li>
   <li>
-    <p>An in-chat app can only exchange data within a chat, with its
+    <p>An in-chat app can only exchange data within a Delta Chat chat, with its
 copies on the devices of your chat partners. Other than that, it’s completely
 isolated from the Internet.</p>
   </li>
@@ -902,7 +899,7 @@ Njëra pajisja s’ka nevojë për tjetrën që të funksionojë.</p>
     <p>Kontrolloni sërish që të dyja pajisjet të gjenden në <strong>të njëjtin rrjet Wi-Fi ose klasik</strong></p>
   </li>
   <li>
-    <p>On <strong>Windows</strong>, go to “Control Panel / Network and Internet”
+    <p>On <strong>Windows</strong>, go to <strong>Control Panel / Network and Internet</strong>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
@@ -954,21 +951,22 @@ provoni <strong>shpërnguljen dorazi</strong> të përshkruar më poshtë</p>
 <p>Kjo metodë rekomandohet vetëm nëse “Shtoni Pajisje të Dytë” si përshkruhet më sipër s’funksionon.</p>
 
 <ul>
-  <li>
-    <p>On the old device, go to <strong>Settings → Chats → Export Backup</strong>. Enter your
+  <li>On the old device, go to “Settings -&gt; Chats and media -&gt; Export Backup”. Enter your
 screen unlock PIN, pattern, or password. Then you can click on “Start
 Backup”. This saves the backup file to your device. Now you have to transfer
-it to the other device somehow.</p>
-  </li>
-  <li>
-    <p>On the new device, select <strong>I Already Have a Profile → Restore from Backup</strong>.
-If you use iOS and encounter difficulties,
-<a href="https://support.delta.chat/t/import-backup-to-ios/1628">this guide</a> might help you.</p>
+it to the other device somehow.</li>
+  <li>On the new device, in the “I already have a profile” menu,
+choose “restore from backup”. After import, your conversations, encryption
+keys, and media should be copied to the new device.
+    <ul>
+      <li><strong>If you use iOS:</strong> and you encounter difficulties, maybe
+<a href="https://support.delta.chat/t/import-backup-to-ios/1628">this guide</a> will
+help you.</li>
+    </ul>
   </li>
+  <li>You are now synchronized, and can use both devices for sending and receiving
+end-to-end encrypted messages with your communication partners.</li>
 </ul>
-
-<p>You are now synchronized, and can use both devices for sending and receiving
-end-to-end encrypted messages with your communication partners.</p>
     
       <h3 id="a-ka-ndonjë-plan-për-të-sjellë-një-klient-web-delta-chat">
         
@@ -999,10 +997,10 @@ Windows Desktop, ose AppImage për Linux. Mund t’i gjeni te
         
       </h2>
     
-      <h3 id="experiments">
+      <h3 id="experimental-features">
         
         
-          Experimental Features <a href="#experiments" class="anchor"></a>
+          Experimental Features <a href="#experimental-features" class="anchor"></a>
         
         
       </h3>
@@ -1015,44 +1013,33 @@ you can try out features we are working on.</p>
 <p>You can find more information
 and give feedback in the <a href="https://support.delta.chat">Forum</a>.</p>
     
-      <h3 id="relays">
+      <h3 id="statssending">
         
         
-          What are Relays? <a href="#relays" class="anchor"></a>
+          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
         
         
       </h3>
 
-<p>Relays are used to temporarily hold messages in case your device is offline.
-Relays are cheap and dumb servers,
-that do not store data as group states, your name or avatar -
-all that exist only on your device.
-Relays are operated by different groups and people.</p>
+<p>We would like to improve Delta Chat with your help,
+which is why Delta Chat for Android asks whether you want
+to send anonymous usage statistics.</p>
 
-<p>By default, after installation, a relay is <strong>automatically set up</strong>,
-so you do not need to care about that.
-However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+<p>You can turn it on and off at
+<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
+
+<p>When you turn it on,
+weekly statistics will be automatically sent to a bot.</p>
+
+<p>We are interested e.g. in statistics like:</p>
 
 <ul>
-  <li>
-    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
-  </li>
-  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
-  </li>
-  <li>
-    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
-  </li>
+  <li>How many contacts are introduced by personally scanning a QR code?</li>
+  <li>Which versions of Delta Chat are being used?</li>
+  <li>How many messages are unencrypted?</li>
 </ul>
 
-<p>For more details and future possibilities of relays,
-you can follow discussions in the <a href="https://support.delta.chat">Forum</a>.</p>
+<p>We will <em>not</em> collect any personally identifiable information about you.</p>
     
       <h3 id="can-i-use-a-classic-email-address-with-delta-chat">
         
@@ -1074,7 +1061,7 @@ while chatmail apps and relays pervasively enforce end-to-end encryption and sec
   </li>
   <li>
     <p>Non-chatmail apps use email servers as a long-term message archive
-while chatmail clients use email servers for ephemeral instant message relay.</p>
+while chatmail clients use email servers for ephemeral instant message transport.</p>
   </li>
   <li>
     <p>Supporting the full variety of classic email setups
@@ -1086,7 +1073,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
       <h3 id="classic-email">
         
         
-          How can I configure a chat profile with a classic email address as relay? <a href="#classic-email" class="anchor"></a>
+          How can I configure a chat profile with a classic email address as transport? <a href="#classic-email" class="anchor"></a>
         
         
       </h3>
@@ -1095,7 +1082,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
 unless you are prepared to deal with encrypted messages in the inbox,
 double notifications, accidentally deleted emails or similar annoyances.</p>
 
-<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Relay</strong>.
+<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Transport</strong>.
 Note that classic email providers will generally not support <a href="#instant-delivery">Push Notifications</a>
 and have other limitations, see <a href="https://providers.delta.chat">Provider Overview</a>.
 Chatmail uses the default INBOX for relay; ensure the provider setup does too. 
@@ -1119,40 +1106,6 @@ except if your users’ devices require Google/Apple <a href="#instant-delivery"
 and <a href="https://github.com/chatmail/core">core Rust developments</a> 
 that power <a href="https://chatmail.at/clients">chatmail clients</a> of which Delta Chat is the most well known.</p>
     
-      <h3 id="statssending">
-        
-        
-          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>We would like to improve Delta Chat with your help,
-which is why Delta Chat for Android asks whether you want
-to send anonymous usage statistics.</p>
-
-<p>You can turn it on and off at
-<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
-
-<p>When you turn it on,
-weekly statistics will be automatically sent to a bot.</p>
-
-<p>We are interested e.g. in statistics like:</p>
-
-<ul>
-  <li>
-    <p>How many contacts are introduced by personally scanning a QR code?</p>
-  </li>
-  <li>
-    <p>Which versions of Delta Chat are being used?</p>
-  </li>
-  <li>
-    <p>What errors occur for users?</p>
-  </li>
-</ul>
-
-<p>We will <em>not</em> collect any personally identifiable information about you.</p>
-    
       <h3 id="më-interesojnë-hollësitë-teknike-mund-të-më-tregoni-diçka-më-tepër">
         
         
@@ -1161,7 +1114,9 @@ weekly statistics will be automatically sent to a bot.</p>
         
       </h3>
 
-<p>Shihni <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Standarde të përdorur në Delta Chat</a>.</p>
+<ul>
+  <li>Shihni <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Standarde të përdorur në Delta Chat</a>.</li>
+</ul>
     
       <h2 id="e2ee">
         
@@ -1400,32 +1355,6 @@ with the knowledge that all their data, along with all metadata, will be deleted
 Moreover, if a device is seized then chat contacts using short-lived profiles
 can not be identified easily.</p>
     
-      <h3 id="who-sees-my-ip-address">
-        
-        
-          Who sees my IP Address? <a href="#who-sees-my-ip-address" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>The used <a href="#relays">relay</a> needs to know your IP Address,
-as well as sometimes your contact’s devices if you have a <a href="#experiments">call</a>
-or use <a href="#webxdc">apps</a> together.</p>
-
-<p>IP Addresses are needed for connectivity and efficiency.
-They are neither persisted nor exposed.
-Note that the IP Address
-is not like a detailed address you give to a delivery service,
-but much more coarse, often defining region or country only.</p>
-
-<p>As this is just how the internet and other messengers work by default,
-we do not offer options here or ask upfront questions.</p>
-
-<p>If you see your IP Address as a security or privacy risk,
-we recommend to use a VPN, in combination with system lockdown mode.
-Hunting down options in all apps on your system will leave gaps.
-For example, tapping a link exposes IP Addresses to unknown parties and is the by far larger risk here.</p>
-    
       <h3 id="sealedsender">
         
         
@@ -1512,12 +1441,12 @@ the connection is safe.</p>
 
 <p>No.</p>
 
-<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1.
-We do not recommend or offer users to perform manual key management.
-We want to ensure that security audits can focus on a few proven cryptographic algorithms
-instead of the full breadth of possible algorithms allowed with OpenPGP.
-If you want to extract your OpenPGP key, there only is an expert method:
-you need to look it up in the “keypairs” SQLite table of a profile backup tar-file.</p>
+<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1. 
+You can export your private key but you can not import additional private keys.</p>
+
+<p>In general, we do not recommend or offer users to perform manual key management. 
+We want to ensure that security audits can focus on a few proven cryptographic algorithms 
+instead of the full breadth of possible algorithms allowed with OpenPGP.</p>
     
       <h3 id="security-audits">
         
@@ -1665,38 +1594,52 @@ ordered chronologically:</p>
 
 <ul>
   <li>
-    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
-program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
-along with collaboration partners working on
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>,
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>,
-<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and
-<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>.
-All of these projects are partially completed or to be completed in early 2025.</p>
+    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
+and implementation of verified groups and setup contact protocols
+in 2017 and 2018 and also helped to integrate end-to-end Encryption
+through <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p>In 2021 we received further EU funding for two Next-Generation-Internet
-proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+    <p><a href="https://opentechfund.org">Open Technology Fund</a> na dha grantin e parë 
+për 2018/2019 (~200 mijë dollarë) me të cilin përmirësuam ndjeshëm aplikacionin
+për Android dhe hodhëm në qarkullim një version të parë beta aplikacioni për Desktop,
+si dhe i afroi më tepër zhvillimet tona për veçori me kërkime UX në kontekste të drejtash të njeriut, 
+shihni <a href="https://delta.chat/en/2019-07-19-uxreport">raportin tonë përfundimtar “Needfinding and UX”</a>.
+Granti i dytë për 2019/2020 (~$300K) na ndihmoi të hedhim në qarkullim 
+versione Delta/iOS, për të shndërruar bibliotekën tonë bazë në Rust, si dhe
+për të sjellë veçori të reja për krejt platformat.</p>
   </li>
   <li>
     <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
 completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
   </li>
   <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p>In 2021 we received further EU funding for two Next-Generation-Internet
+proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
   </li>
   <li>
-    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
-and implementation of verified groups and setup contact protocols
-in 2017 and 2018 and also helped to integrate end-to-end Encryption
-through <a href="https://autocrypt.org">Autocrypt</a>.</p>
+    <p>From End 2021 till March 2023 we received <em>Internet Freedom</em> funding (500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supported our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of email servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
+  </li>
+  <li>
+    <p>2023-2024 we successfully completed the OTF-funded 
+<a href="https://www.opentech.fund/projects-we-support/supported-projects/secure-chat-mail-with-delta-chat/">Secure Chatmail project</a>, 
+allowing us to introduce guaranteed encryption, 
+creating a <a href="https://delta.chat/chatmail">chatmail server network</a> 
+and providing “instant onboarding” in all apps released from April 2024 on.</p>
+  </li>
+  <li>
+    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
+program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
+along with collaboration partners working on 
+<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>, 
+<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>, 
+<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and 
+<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>. 
+All of these projects are partially completed or to be completed in early 2025.</p>
   </li>
   <li>
     <p>Ndonjëherë marrim dhurime unike nga individë privatë. 

src/main/assets/help/uk/help.html

@@ -8,7 +8,7 @@
       <li><a href="#чи-підтримує-delta-chat-вкладення-у-вигляді-фото-відео-тощо">Чи підтримує Delta Chat вкладення у вигляді фото, відео тощо?</a></li>
       <li><a href="#multiple-accounts">Що таке профілі? Як я можу перемикатися між ними?</a></li>
       <li><a href="#хто-бачить-моє-зображення-профілю">Хто бачить моє зображення профілю?</a></li>
-      <li><a href="#signature">Чи можу я встановити біографію/статус у Delta Chat?</a></li>
+      <li><a href="#signature">Can I set a Bio/Status with Delta Chat?</a></li>
       <li><a href="#що-значить-закріплення-приглушення-архівування">Що значить Закріплення, Приглушення, Архівування?</a></li>
       <li><a href="#save">Як працюють “Збережені повідомлення”?</a></li>
       <li><a href="#що-означає-зелена-точка">Що означає зелена точка?</a></li>
@@ -16,16 +16,16 @@
       <li><a href="#edit">Виправлення помилок та видалення повідомлень після надсилання</a></li>
       <li><a href="#ephemeralmsgs">Як працюють повідомлення, що зникають?</a></li>
       <li><a href="#delold">Що станеться, якщо я ввімкну «Видаляти старі повідомлення з пристрою»?</a></li>
+      <li><a href="#remove-account">How can I delete my chat profile?</a></li>
     </ul>
   </li>
-  <li><a href="#groups">Групи</a>
+  <li><a href="#groups">Groups</a>
     <ul>
       <li><a href="#створення-групи">Створення групи</a></li>
-      <li><a href="#addmembers">Додавання та видалення учасників</a></li>
+      <li><a href="#addmembers">Add and remove members</a></li>
       <li><a href="#я-випадково-себе-видалив">Я випадково себе видалив</a></li>
       <li><a href="#я-більше-не-хочу-отримувати-повідомлення-групи">Я більше не хочу отримувати повідомлення групи.</a></li>
-      <li><a href="#клонування-групи">Клонування групи</a></li>
-      <li><a href="#how-many-members-can-participate-in-a-single-group">How many members can participate in a single group?</a></li>
+      <li><a href="#cloning-a-group">Cloning a group</a></li>
     </ul>
   </li>
   <li><a href="#webxdc">In-chat apps</a>
@@ -54,20 +54,19 @@
   </li>
   <li><a href="#advanced">Advanced</a>
     <ul>
-      <li><a href="#experiments">Експериментальні функції</a></li>
-      <li><a href="#relays">What are Relays?</a></li>
-      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
-      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as relay?</a></li>
-      <li><a href="#я-хочу-керувати-власним-сервером-для-delta-chat-що-ви-порекомендуєте">Я хочу керувати власним сервером для Delta Chat. Що ви порекомендуєте?</a></li>
+      <li><a href="#experimental-features">Experimental Features</a></li>
       <li><a href="#statssending">What is “Send statistics to Delta Chat’s developers”?</a></li>
+      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
+      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as transport?</a></li>
+      <li><a href="#я-хочу-керувати-власним-сервером-для-delta-chat-що-ви-порекомендуєте">Я хочу керувати власним сервером для Delta Chat. Що ви порекомендуєте?</a></li>
       <li><a href="#мене-цікавлять-технічні-деталі-можете-розповісти-більше">Мене цікавлять технічні деталі. Можете розповісти більше?</a></li>
     </ul>
   </li>
   <li><a href="#e2ee">Шифрування та безпека</a>
     <ul>
       <li><a href="#які-стандарти-використовуються-для-наскрізного-шифрування">Які стандарти використовуються для наскрізного шифрування?</a></li>
-      <li><a href="#whene2e">Як дізнатися, чи повідомлення зашифровано наскрізним шифруванням?</a></li>
-      <li><a href="#чи-можу-я-отримувати-та-надсилати-пошту-без-наскрізного-шифрування">Чи можу я отримувати та надсилати пошту без наскрізного шифрування?</a></li>
+      <li><a href="#whene2e">How can I know if messages are end-to-end encrypted?</a></li>
+      <li><a href="#can-i-still-receive-or-send-messages-without-end-to-end-encryption">Can I still receive or send messages without end-to-end encryption?</a></li>
       <li><a href="#e2eeguarantee">Що означає зелена галочка в профілі контакту?</a></li>
       <li><a href="#чи-зашифровані-наскрізно-вкладення-зображення-файли-аудіо-тощо">Чи зашифровані наскрізно вкладення (зображення, файли, аудіо тощо)?</a></li>
       <li><a href="#openpgp-secure">Чи безпечний OpenPGP?</a></li>
@@ -76,7 +75,6 @@
       <li><a href="#чи-повідомлення-позначені-значком-пошти-доступні-в-інтернетіtls">Чи повідомлення, позначені значком пошти, доступні в Інтернеті?{#tls}</a></li>
       <li><a href="#message-metadata">Як Delta Chat захищає метадані у повідомленнях?</a></li>
       <li><a href="#device-seizure">Як захистити метадані та контакти якщо пристрій вилучено?</a></li>
-      <li><a href="#who-sees-my-ip-address">Who sees my IP Address?</a></li>
       <li><a href="#sealedsender">Чи підтримує Delta Chat функцію “Запечатаний відправник”?</a></li>
       <li><a href="#pfs">Чи підтримує Delta Chat цілковиту пряму секретність (Perfect Forward Secrecy)?</a></li>
       <li><a href="#pqc">Чи підтримує Delta Chat пост-квантову криптографію?</a></li>
@@ -114,17 +112,20 @@
  які пропонують миттєву доставку повідомлень та push-сповіщення для пристроїв iOS та Android.</p>
   </li>
   <li>
-    <p>Повсюдна підтримка багатьох <a href="#multiple-accounts">профілів</a> та   <a href="#multiclient">пристроїв</a> на всіх платформах та між різними <a href="https://chatmail.at/clients">поштовими програмами</a>.</p>
+    <p>Pervasive <a href="#multiple-accounts">multi-profile</a> and
+<a href="#multiclient">multi-device</a> support on all platforms
+and between different <a href="https://chatmail.at/clients">chatmail apps</a>.</p>
   </li>
   <li>
-    <p>Інтерактивні <a href="https://webxdc.org/">веб-застосунки у чатах</a> для ігор та співпраці</p>
+    <p>Interactive <a href="#webxdc">in-chat apps</a> for gaming and collaboration</p>
   </li>
   <li>
-    <p><a href="#security-audits">Аудитоване наскрізне шифрування</a>
- захищене від мережевих та серверних атак.</p>
+    <p><a href="#security-audits">Audited end-to-end encryption</a>
+safe against network and server attacks.</p>
   </li>
   <li>
-    <p>Вільне програмне забезпечення з відкритим вихідним кодом, як застосунок, так серверна частина, побудоване на основі <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Інтернет-стандартів</a>.</p>
+    <p>Free and Open Source software, both app and server side,
+built on <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Internet Standards</a>.</p>
   </li>
 </ul>
     
@@ -136,7 +137,8 @@
         
       </h3>
 
-<p>По-перше, зверніть увагу, що Delta Chat - це приватний месенджер. Тут немає публічного розкриття, <em>ви</em> самі вирішуєте, з ким спілкуватися.</p>
+<p>First, note that Delta Chat is a private messenger.
+There is no public discovery, <em>you</em> decide about your contacts.</p>
 
 <ul>
   <li>
@@ -154,7 +156,7 @@ through another private chat.</p>
   </li>
 </ul>
 
-<p>Зараз зачекайте, поки встановлюється з’єднання.</p>
+<p>Now wait while connection gets established.</p>
 
 <ul>
   <li>
@@ -167,9 +169,9 @@ the ability to chat is delayed until connectivity is restored.</p>
   </li>
 </ul>
 
-<p>Вітаємо! 
-Тепер Ви автоматично використовуватимете <a href="#e2ee">наскрізне шифрування</a> з цим контактом.
-Якщо ви додасте один одного у <a href="#groups">групи</a>, наскрізне шифрування буде встановлено між усіма учасниками.</p>
+<p>Congratulations!
+You now will automatically use <a href="#e2ee">end-to-end encryption</a> with this contact.
+If you add each other to <a href="#groups">groups</a>, end-to-end encryption will be established among all members.</p>
     
       <h3 id="why-is-a-chat-marked-as-request">
         
@@ -182,8 +184,7 @@ the ability to chat is delayed until connectivity is restored.</p>
 <p>As being a private messenger,
 only friends and family you <a href="#howtoe2ee">share your QR code or invite link with</a> can write to you.</p>
 
-<p>Your friends may share your contact with other friends,
-this appears as <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Request</b></p>
+<p>Your friends may share your contact with other friends, this appears as a <strong>request</strong>.</p>
 
 <ul>
   <li>
@@ -219,10 +220,15 @@ and can tap it to start chatting with the first contact.</p>
         
       </h3>
 
-<p>Так. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
+<ul>
+  <li>
+    <p>Так. Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
 or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>З міркувань продуктивності, зображення оптимізовані та надсилаються в меншому розмірі за замовчуванням, але ви можете надіслати їх як «файл», щоб зберегти оригінал.</p>
+  </li>
+  <li>
+    <p>З міркувань продуктивності, зображення оптимізовані та надсилаються в меншому розмірі за замовчуванням, але ви можете надіслати їх як «файл», щоб зберегти оригінал.</p>
+  </li>
+</ul>
     
       <h3 id="multiple-accounts">
         
@@ -240,7 +246,7 @@ and uses the server only to relay messages.</p>
 
 <p>Пізніше ви можете натиснути на зображення вашого профілю у верхньому лівому кутку, щоб вибрати <strong>Додати профілі</strong> або <strong>Переключити профілі</strong>.</p>
 
-<p>Ви можете використовувати окремі профілі для політичної, сімейної або робочої діяльності.</p>
+<p>You may want to use separate profiles for political, family or work related activities.</p>
 
 <p>Ви також можете дізнатися <a href="#multiclient">як використовувати один і той самий профіль на декількох пристроях</a>.</p>
     
@@ -252,14 +258,19 @@ and uses the server only to relay messages.</p>
         
       </h3>
 
-<p>Ви можете додати зображення профілю в ваших налаштуваннях. Якщо ви пишете комусь із ваших контактів чи додаєте їх через QR код, вони автоматично побачать ваше зображення профілю.</p>
-
-<p>Із міркувань приватності, ніхто не бачить ваше зображення профілю доки ви їм не напишете.</p>
+<ul>
+  <li>
+    <p>Ви можете додати зображення профілю в ваших налаштуваннях. Якщо ви пишете комусь із ваших контактів чи додаєте їх через QR код, вони автоматично побачать ваше зображення профілю.</p>
+  </li>
+  <li>
+    <p>Із міркувань приватності, ніхто не бачить ваше зображення профілю доки ви їм не напишете.</p>
+  </li>
+</ul>
     
       <h3 id="signature">
         
         
-          Чи можу я встановити біографію/статус у Delta Chat? <a href="#signature" class="anchor"></a>
+          Can I set a Bio/Status with Delta Chat? <a href="#signature" class="anchor"></a>
         
         
       </h3>
@@ -287,7 +298,8 @@ they will see it when they view your contact details.</p>
     <p><strong>Приглушіть чати</strong> якщо ви не хочете отримувати сповіщення для них. Приглушені чати залишаються на місці і ви також можете закріпити приглушений чат.</p>
   </li>
   <li>
-    <p><strong>Архівуйте чати</strong>, якщо ви більше не хочете бачити їх у своєму списку чатів. Заархівовані чати залишаються доступними над списком чатів або через пошук.</p>
+    <p><strong>Архівуйте чати</strong>, якщо ви більше не хочете бачити їх у своєму списку чатів. 
+Заархівовані чати залишаються доступними над списком чатів або через пошук.</p>
   </li>
   <li>
     <p>Коли архівний чат отримує нове повідомлення, якщо не приглушений, він <strong>вискочить з архіву</strong> і повернеться у ваш список чатів.
@@ -354,18 +366,22 @@ and others will as well not always see that you are “online”.</p>
 <ul>
   <li>
     <p><strong>One tick</strong> <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick1.png" alt="" />
-means that the message was sent successfully to the <a href="#relays">relay</a>.</p>
+means that the message was sent successfully to your provider.</p>
   </li>
   <li>
     <p><strong>Two ticks</strong>  <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick2.png" alt="" />
-indicate your contact has read the message.</p>
+mean that at least one recipient’s device
+reported back to having received the message.</p>
+  </li>
+  <li>
+    <p>Recipients may have disabled read-receipts,
+so even if you see only one tick, the message may have been read.</p>
+  </li>
+  <li>
+    <p>The other way round, two ticks do not automatically mean
+that a human has read or understood the message ;)</p>
   </li>
 </ul>
-
-<p>In <a href="#groups">groups</a> the second tick means that at least one member has reported back having read the message.</p>
-
-<p>You will only get the second tick if both you and one of the recipients who read the message
-has <strong>Settings → Chats → Read Receipts</strong> enabled.</p>
     
       <h3 id="edit">
         
@@ -426,12 +442,19 @@ the (anyway encrypted) messages may take longer to get deleted from their server
         
       </h3>
 
-<p>Якщо ви хочете заощадити пам’ять на своєму пристрої, ви можете видалити старе повідомлення автоматично.</p>
-
-<p>Щоб увімкнути його, перейдіть до «видалити старі повідомлення з пристрою» в налаштуваннях «Чатів та медіа» . Ви можете встановити часові рамки від «через годину» до «через рік»; 
-Таким чином, <em>усі</em> повідомлення будуть видалені з вашого пристрою, як тільки вони будуть старішими за це.</p>
-
-<p>Як я можу видалити свій профіль у Delta Chat? {#remove-account}</p>
+<ul>
+  <li>Якщо ви хочете заощадити пам’ять на своєму пристрої, ви можете видалити старе повідомлення автоматично.</li>
+  <li>Щоб увімкнути його, перейдіть до «видалити старі повідомлення з пристрою» в налаштуваннях «Чатів та медіа» . Ви можете встановити часові рамки від «через годину» до «через рік»; 
+Таким чином, <em>усі</em> повідомлення будуть видалені з вашого пристрою, як тільки вони будуть старішими за це.</li>
+</ul>
+    
+      <h3 id="remove-account">
+        
+        
+          How can I delete my chat profile? <a href="#remove-account" class="anchor"></a>
+        
+        
+      </h3>
 
 <p>If you are using more than one chat profile,
 you can remove single ones in the top profile switcher menu (on Android and iOS),
@@ -447,12 +470,12 @@ or the respective page from your chosen <a href="https://chatmail.at/relays">3rd
       <h2 id="groups">
         
         
-          Групи <a href="#groups" class="anchor"></a>
+          Groups <a href="#groups" class="anchor"></a>
         
         
       </h2>
 
-<p>Групи дозволяють кільком людям спілкуватися у приватному чаті з <strong>рівними правами</strong>.</p>
+<p>Groups let several people chat together privately with <strong>equal rights</strong>.</p>
 
 <p>Anyone can
 change the group name or avatar,
@@ -460,7 +483,7 @@ change the group name or avatar,
 set <a href="#ephemeralmsgs">disappearing messages</a>,
 and <a href="#edit">delete their own messages</a> from all member’s devices.</p>
 
-<p>Оскільки усі учасники мають однакові права, групи найкраще працюють серед <strong>довірених друзів та родичів</strong>.</p>
+<p>Because all members have the same rights, groups work best among <strong>trusted friends and family</strong>.</p>
     
       <h3 id="створення-групи">
         
@@ -471,29 +494,24 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
       </h3>
 
 <ul>
-  <li>
-    <p>Оберіть <strong>Новий чат</strong>, потім <strong>Нова групи</strong> у меню в верхньому правому кутку або натисніть відповідну кнопку у Android/iOS.</p>
-  </li>
-  <li>
-    <p>На наступному екрані виберіть <strong>учасники групи</strong> та встановіть <strong>назву групи</strong>. Ви також можете обрати <strong>аватар групи</strong>.</p>
-  </li>
-  <li>
-    <p>Як тільки ви напишете <strong>перше повідомлення</strong> у групу, усі учасники будуть проінформовані про нову групу і зможуть відповісти у нову групу (доки ви не напишете повідомлення у групі, група залишатиметься невидимою для учасників).</p>
-  </li>
+  <li>Оберіть <strong>Новий чат</strong>, потім <strong>Нова групи</strong> у меню в верхньому правому кутку або натисніть відповідну кнопку у Android/iOS.</li>
+  <li>На наступному екрані виберіть <strong>учасники групи</strong> та встановіть <strong>назву групи</strong>. Ви також можете обрати <strong>аватар групи</strong>.</li>
+  <li>Як тільки ви напишете <strong>перше повідомлення</strong> у групу, усі учасники будуть проінформовані про нову групу і зможуть відповісти у нову групу (доки ви не напишете повідомлення у групі, група залишатиметься невидимою для учасників).</li>
 </ul>
     
       <h3 id="addmembers">
         
         
-          Додавання та видалення учасників <a href="#addmembers" class="anchor"></a>
+          Add and remove members <a href="#addmembers" class="anchor"></a>
         
         
       </h3>
 
-<p>All group members have the <strong>same rights</strong>.
-For this reason, everyone can delete any member or add new ones.</p>
-
 <ul>
+  <li>
+    <p>All group members have the <strong>same rights</strong>.
+For this reason, everyone can delete any member or add new ones.</p>
+  </li>
   <li>
     <p>To <strong>add or delete members</strong>, tap the group name in the chat and select the member to add or remove.</p>
   </li>
@@ -521,7 +539,9 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
         
       </h3>
 
-<p>Оскільки ви більше не учасник групи, ви не зможете додати себе знову. Однак, це не проблема, просто попросіть будь-якого іншого учасника групи в звичайному чаті додати вас знову.</p>
+<ul>
+  <li>Оскільки ви більше не учасник групи, ви не зможете додати себе знову. Однак, це не проблема, просто попросіть будь-якого іншого учасника групи в звичайному чаті додати вас знову.</li>
+</ul>
     
       <h3 id="я-більше-не-хочу-отримувати-повідомлення-групи">
         
@@ -532,15 +552,18 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
       </h3>
 
 <ul>
-  <li>Або видаліть себе із списку учасників групи, або видаліть весь чат. Якщо ви хочете повернутись до чату пізніше, попросіть іншого учасника групи додати вас знову.</li>
+  <li>
+    <p>Або видаліть себе із списку учасників групи, або видаліть весь чат. Якщо ви хочете повернутись до чату пізніше, попросіть іншого учасника групи додати вас знову.</p>
+  </li>
+  <li>
+    <p>Ви також можете “Заглушити” групу - це означає, що ви будете отримувати усі повідомлення та можете писати у групу, але ви більше не будете отримувати сповіщення про нові повідомлення.</p>
+  </li>
 </ul>
-
-<p>Ви також можете “Заглушити” групу - це означає, що ви будете отримувати усі повідомлення та можете писати у групу, але ви більше не будете отримувати сповіщення про нові повідомлення.</p>
     
-      <h3 id="клонування-групи">
+      <h3 id="cloning-a-group">
         
         
-          Клонування групи <a href="#клонування-групи" class="anchor"></a>
+          Cloning a group <a href="#cloning-a-group" class="anchor"></a>
         
         
       </h3>
@@ -558,23 +581,8 @@ or right-click the group in the chat list (Desktop).</p>
   </li>
 </ul>
 
-<p>Нова група є <strong>цілком незалежною</strong> від оригінальної,
-котра продовжує працювати як раніше.</p>
-    
-      <h3 id="how-many-members-can-participate-in-a-single-group">
-        
-        
-          How many members can participate in a single group? <a href="#how-many-members-can-participate-in-a-single-group" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>There is no strict technical limit,
-but more than 150 is not recommended.</p>
-
-<p>As groups get larger, they can become socially unstable and may need a hierarchy -
-where Delta Chat is a private messenger for chatting with <a href="#groups">equal rights</a>.
-See <a href="https://en.wikipedia.org/wiki/Dunbar%27s_number">Dunbar’s number</a> for more insights.</p>
+<p>The new group is <strong>fully independent</strong> from the original,
+which continues to work as before.</p>
     
       <h2 id="webxdc">
         
@@ -617,7 +625,7 @@ This makes Delta Chat a truly extensible messenger.</p>
     <p>In-chat apps can not send data to the Internet, or download anything.</p>
   </li>
   <li>
-    <p>An in-chat app can only exchange data within a chat, with its
+    <p>An in-chat app can only exchange data within a Delta Chat chat, with its
 copies on the devices of your chat partners. Other than that, it’s completely
 isolated from the Internet.</p>
   </li>
@@ -647,8 +655,8 @@ trust the people you chat with, you can trust the in-chat app as well.</p>
 to get started.</p>
   </li>
   <li>
-    <p>Все інше, що Вам потрібно знати, написано у
-<a href="https://webxdc.org/docs">документації Webxdc</a>.</p>
+    <p>All else you need to know is written in the
+<a href="https://webxdc.org/docs">Webxdc documentation</a>.</p>
   </li>
   <li>
     <p>If you have question, you can ask others with experience
@@ -833,7 +841,7 @@ Welcome to the power of the interoperable chatmail relay network :)</p>
     <p>Ще раз упевніться, що обидва пристрої підключені до <strong>одного Wi-Fi або мережі</strong></p>
   </li>
   <li>
-    <p>У <strong>Windows</strong> перейдіть до “Панель керування / Мережа та Інтернет” і переконайтеся, що <strong>Приватна мережа</strong> вибрано як “Тип мережевого профілю” (після перенесення ви можете повернути початкове значення)</p>
+    <p>У <strong>Windows</strong> перейдіть до <strong>Панель керування / Мережа та Інтернет</strong> і переконайтеся, що <strong>Приватна мережа</strong> вибрано як “Тип мережевого профілю” (після перенесення ви можете повернути початкове значення)</p>
   </li>
   <li>
     <p>На <strong>iOS</strong> переконайтеся, що доступ до “Системні налаштування / Програми / Delta Chat / <strong>Локальна мережа</strong>” дозволено</p>
@@ -875,14 +883,11 @@ Welcome to the power of the interoperable chatmail relay network :)</p>
 <p>Цей спосіб рекомендований, лише якщо «Додати другий пристрій», як описано вище, не працює.</p>
 
 <ul>
-  <li>
-    <p>На старому пристрої перейдіть до <strong>Налаштування → Чати та медіа → Експортувати резервну копію</strong>. Введіть свій PIN-код, графічний ключ або пароль розблокування екрана. Потім ви можете натиснути на “Почати резервне копіювання”. Це збереже файл резервної копії на вашому пристрої. Тепер вам потрібно якось перенести його на інший пристрій.</p>
-  </li>
-  <li>На новому пристрої в меню <strong>У мене вже є профіль</strong> виберіть <strong>Відновити з резервної копії</strong>. Після імпорту ваші розмови, ключі шифрування ключі шифрування та медіа повинні бути скопійовані на новий пристрій.</li>
-  <li>Якщо ви користуєтеся iOS: і у вас виникли труднощі, можливо <a href="https://support.delta.chat/t/import-backup-to-ios/1628">цей посібник</a> допоможе вам.</li>
+  <li>На старому пристрої перейдіть до “Налаштування -&gt; Чати та медіа -&gt; Експортувати резервну копію”. Введіть свій   PIN-код, графічний ключ або пароль розблокування екрана. Потім ви можете натиснути на “Почати резервне копіювання”. Це збереже файл резервної копії на вашому пристрої. Тепер вам потрібно якось перенести його на інший пристрій.</li>
+  <li>На новому пристрої в меню “У мене вже є профіль” виберіть “Відновити з резервної копії”. Після імпорту ваші розмови, ключі шифрування   ключі шифрування та медіа повинні бути скопійовані на новий пристрій.</li>
+  <li>Якщо ви користуєтеся iOS:** і у вас виникли труднощі, можливо <a href="https://support.delta.chat/t/import-backup-to-ios/1628">цей посібник</a> допоможе вам.</li>
+  <li>Тепер ви синхронізовані і можете використовувати обидва пристрої для надсилання та отримання наскрізних зашифрованих повідомлень зі своїми партнерами по спілкуванню.</li>
 </ul>
-
-<p>Тепер ви синхронізовані і можете використовувати обидва пристрої для надсилання та отримання наскрізних зашифрованих повідомлень зі своїми партнерами по спілкуванню.</p>
     
       <h3 id="чи-планується-впровадження-веб-клієнта-delta-chat">
         
@@ -906,10 +911,10 @@ Welcome to the power of the interoperable chatmail relay network :)</p>
         
       </h2>
     
-      <h3 id="experiments">
+      <h3 id="experimental-features">
         
         
-          Експериментальні функції <a href="#experiments" class="anchor"></a>
+          Experimental Features <a href="#experimental-features" class="anchor"></a>
         
         
       </h3>
@@ -917,49 +922,38 @@ Welcome to the power of the interoperable chatmail relay network :)</p>
 <p>At <strong>Settings → Advanced → Experimental Features</strong>
 you can try out features we are working on.</p>
 
-<p>Ці функції можуть бути <strong>нестабільними</strong> та можуть бути <strong>змінені або видалені</strong>.</p>
+<p>The features may be <strong>unstable</strong> and may be <strong>changed or removed</strong>.</p>
 
-<p>Ви можете знайти додаткову інформацію
-та залишити відгук на <a href="https://support.delta.chat">форумі</a>.</p>
+<p>You can find more information
+and give feedback in the <a href="https://support.delta.chat">Forum</a>.</p>
     
-      <h3 id="relays">
+      <h3 id="statssending">
         
         
-          What are Relays? <a href="#relays" class="anchor"></a>
+          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
         
         
       </h3>
 
-<p>Relays are used to temporarily hold messages in case your device is offline.
-Relays are cheap and dumb servers,
-that do not store data as group states, your name or avatar -
-all that exist only on your device.
-Relays are operated by different groups and people.</p>
+<p>We would like to improve Delta Chat with your help,
+which is why Delta Chat for Android asks whether you want
+to send anonymous usage statistics.</p>
 
-<p>By default, after installation, a relay is <strong>automatically set up</strong>,
-so you do not need to care about that.
-However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+<p>You can turn it on and off at
+<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
+
+<p>When you turn it on,
+weekly statistics will be automatically sent to a bot.</p>
+
+<p>We are interested e.g. in statistics like:</p>
 
 <ul>
-  <li>
-    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
-  </li>
-  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
-  </li>
-  <li>
-    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
-  </li>
+  <li>How many contacts are introduced by personally scanning a QR code?</li>
+  <li>Which versions of Delta Chat are being used?</li>
+  <li>How many messages are unencrypted?</li>
 </ul>
 
-<p>For more details and future possibilities of relays,
-you can follow discussions in the <a href="https://support.delta.chat">Forum</a>.</p>
+<p>We will <em>not</em> collect any personally identifiable information about you.</p>
     
       <h3 id="can-i-use-a-classic-email-address-with-delta-chat">
         
@@ -981,7 +975,7 @@ while chatmail apps and relays pervasively enforce end-to-end encryption and sec
   </li>
   <li>
     <p>Non-chatmail apps use email servers as a long-term message archive
-while chatmail clients use email servers for ephemeral instant message relay.</p>
+while chatmail clients use email servers for ephemeral instant message transport.</p>
   </li>
   <li>
     <p>Supporting the full variety of classic email setups
@@ -993,7 +987,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
       <h3 id="classic-email">
         
         
-          How can I configure a chat profile with a classic email address as relay? <a href="#classic-email" class="anchor"></a>
+          How can I configure a chat profile with a classic email address as transport? <a href="#classic-email" class="anchor"></a>
         
         
       </h3>
@@ -1002,7 +996,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
 unless you are prepared to deal with encrypted messages in the inbox,
 double notifications, accidentally deleted emails or similar annoyances.</p>
 
-<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Relay</strong>.
+<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Transport</strong>.
 Note that classic email providers will generally not support <a href="#instant-delivery">Push Notifications</a>
 and have other limitations, see <a href="https://providers.delta.chat">Provider Overview</a>.
 Chatmail uses the default INBOX for relay; ensure the provider setup does too. 
@@ -1026,40 +1020,6 @@ except if your users’ devices require Google/Apple <a href="#instant-delivery"
 and <a href="https://github.com/chatmail/core">core Rust developments</a> 
 that power <a href="https://chatmail.at/clients">chatmail clients</a> of which Delta Chat is the most well known.</p>
     
-      <h3 id="statssending">
-        
-        
-          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>We would like to improve Delta Chat with your help,
-which is why Delta Chat for Android asks whether you want
-to send anonymous usage statistics.</p>
-
-<p>You can turn it on and off at
-<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
-
-<p>Коли Ви увімкнете цю функцію,
-щотижнева статистика буде автоматично надсилатися боту.</p>
-
-<p>We are interested e.g. in statistics like:</p>
-
-<ul>
-  <li>
-    <p>How many contacts are introduced by personally scanning a QR code?</p>
-  </li>
-  <li>
-    <p>Which versions of Delta Chat are being used?</p>
-  </li>
-  <li>
-    <p>What errors occur for users?</p>
-  </li>
-</ul>
-
-<p>Ми <em>не</em> будемо збирати жодних персональних даних, які б могли ідентифікувати Вас особисто.</p>
-    
       <h3 id="мене-цікавлять-технічні-деталі-можете-розповісти-більше">
         
         
@@ -1068,7 +1028,9 @@ to send anonymous usage statistics.</p>
         
       </h3>
 
-<p>Дивіться <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Стандарти, що використовуються у Delta Chat</a>.</p>
+<ul>
+  <li>Дивіться <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Стандарти, що використовуються у Delta Chat</a>.</li>
+</ul>
     
       <h2 id="e2ee">
         
@@ -1105,17 +1067,17 @@ to send anonymous usage statistics.</p>
       <h3 id="whene2e">
         
         
-          Як дізнатися, чи повідомлення зашифровано наскрізним шифруванням? <a href="#whene2e" class="anchor"></a>
+          How can I know if messages are end-to-end encrypted? <a href="#whene2e" class="anchor"></a>
         
         
       </h3>
 
 <p>Всі повідомлення в Delta Chat за замовчуванням <strong>наскрізно зашифровані</strong>. Починаючи з версії 2 Delta Chat (липень 2025 року) на наскрізних зашифрованих повідомленнях більше немає замків або інших подібних маркерів.</p>
     
-      <h3 id="чи-можу-я-отримувати-та-надсилати-пошту-без-наскрізного-шифрування">
+      <h3 id="can-i-still-receive-or-send-messages-without-end-to-end-encryption">
         
         
-          Чи можу я отримувати та надсилати пошту без наскрізного шифрування? <a href="#чи-можу-я-отримувати-та-надсилати-пошту-без-наскрізного-шифрування" class="anchor"></a>
+          Can I still receive or send messages without end-to-end encryption? <a href="#can-i-still-receive-or-send-messages-without-end-to-end-encryption" class="anchor"></a>
         
         
       </h3>
@@ -1203,9 +1165,21 @@ and there must be tangible improvements for users.</p>
         
       </h3>
 
-<p>Якщо ви надсилаєте або отримуєте електронні листи без наскрізного шифрування (використовуючи класичний сервер електронної пошти), вони все одно захищені від мобільних або кабельних компаній, які не можуть читати чи змінювати ваші повідомлення. Однак як ваш, так і поштовий провайдер одержувача можуть читати, аналізувати або змінювати ваші листи, включаючи будь-які вкладення.</p>
+<p>If you are sending or receiving email messages without end-to-end encryption (using a classic email server),
+they are still protected from cell or cable companies who can not read or modify your email messages.
+But both your and your recipient’s email providers
+may read, analyze or modify your messages, including any attachments.</p>
 
-<p>За замовчуванням Delta Chat використовує суворе <a href="https://en.wikipedia.org/wiki/Transport_Layer_Security">TLS-шифрування</a> яке захищає з’єднання між вашим пристроєм і провайдером електронної пошти. Вся робота з TLS-шифруванням Delta Chat пройшла незалежний <a href="#security-audits">аудит безпеки</a>. Крім того, з’єднання між вашим провайдером та провайдером електронної пошти одержувача зазвичай також шифрується при передачі даних. Якщо задіяні поштові сервери підтримують <a href="https://datatracker.ietf.org/doc/html/rfc8461">MTA-STS</a> то між провайдерами електронної пошти буде застосовуватися транспортне шифрування в цьому випадку повідомлення Delta Chat ніколи не будуть доступні в Інтернеті у вигляді відкритого тексту навіть якщо повідомлення не було наскрізь зашифровано.</p>
+<p>Delta Chat by default uses strict 
+<a href="https://en.wikipedia.org/wiki/Transport_Layer_Security">TLS encryption</a> 
+which secures connections between your device and your email provider.
+All of Delta Chat’s TLS-handling has been independently <a href="#security-audits">security audited</a>.
+Moreover, the connection between your and the recipient’s email provider
+will typically be transport-encrypted as well.
+If the involved email servers support <a href="https://datatracker.ietf.org/doc/html/rfc8461">MTA-STS</a>
+then transport encryption will be enforced between email providers
+in which case Delta Chat communications will never be exposed in cleartext to the Internet
+even if the message was not end-to-end encrypted.</p>
     
       <h3 id="message-metadata">
         
@@ -1220,11 +1194,11 @@ and there must be tangible improvements for users.</p>
 <p>Servers can therefore only see:</p>
 
 <ul>
-  <li>адреси відправника та одержувача</li>
-  <li>та розмір повідомлення.</li>
+  <li>the sender and receiver addresses</li>
+  <li>and the message size.</li>
 </ul>
 
-<p>За замовчуванням адреси генеруються випадковим чином.</p>
+<p>By default, the addresses are randomly generated.</p>
 
 <p>Усі інші метадані повідомлень, контактів і груп містяться в наскрізно зашифрованій частині повідомлень.</p>
     
@@ -1246,32 +1220,6 @@ with the knowledge that all their data, along with all metadata, will be deleted
 Moreover, if a device is seized then chat contacts using short-lived profiles
 can not be identified easily.</p>
     
-      <h3 id="who-sees-my-ip-address">
-        
-        
-          Who sees my IP Address? <a href="#who-sees-my-ip-address" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>The used <a href="#relays">relay</a> needs to know your IP Address,
-as well as sometimes your contact’s devices if you have a <a href="#experiments">call</a>
-or use <a href="#webxdc">apps</a> together.</p>
-
-<p>IP Addresses are needed for connectivity and efficiency.
-They are neither persisted nor exposed.
-Note that the IP Address
-is not like a detailed address you give to a delivery service,
-but much more coarse, often defining region or country only.</p>
-
-<p>As this is just how the internet and other messengers work by default,
-we do not offer options here or ask upfront questions.</p>
-
-<p>If you see your IP Address as a security or privacy risk,
-we recommend to use a VPN, in combination with system lockdown mode.
-Hunting down options in all apps on your system will leave gaps.
-For example, tapping a link exposes IP Addresses to unknown parties and is the by far larger risk here.</p>
-    
       <h3 id="sealedsender">
         
         
@@ -1336,12 +1284,9 @@ but an implementation has not been agreed as a priority yet.</p>
 
 <p>Ні.</p>
 
-<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1.
-We do not recommend or offer users to perform manual key management.
-We want to ensure that security audits can focus on a few proven cryptographic algorithms
-instead of the full breadth of possible algorithms allowed with OpenPGP.
-If you want to extract your OpenPGP key, there only is an expert method:
-you need to look it up in the “keypairs” SQLite table of a profile backup tar-file.</p>
+<p>Delta Chat генерує безпечні ключі OpenPGP відповідно до специфікації Autocrypt 1.1. Ви можете експортувати свій приватний ключ, але не можете імпортувати додаткові приватні ключі.</p>
+
+<p>Загалом, ми не рекомендуємо і не пропонуємо користувачам керувати ключами вручну. Ми хочемо гарантувати, що аудит безпеки може зосередитися на декількох перевірених криптографічних алгоритмах а не на всій широті можливих алгоритмів, дозволених у OpenPGP.</p>
     
       <h3 id="security-audits">
         
@@ -1400,7 +1345,7 @@ you need to look it up in the “keypairs” SQLite table of a profile backup ta
 <p>Some features require certain permissions,
 e.g. you need to grant camera permission if you want to <a href="#howtoe2ee">scan an invite QR code</a>.</p>
 
-<p>Дивіться <a href="https://delta.chat/en/gdpr#24-app-permissions">політику конфіденційності</a> для детального огляду.</p>
+<p>See <a href="https://delta.chat/en/gdpr#24-app-permissions">Privacy Policy</a> for a detailed overview.</p>
     
       <h3 id="де-мої-друзі-можуть-знайти-delta-chat">
         
@@ -1445,35 +1390,38 @@ Google Play Store, F-Droid, Huawei App Gallery, iOS and macOS App Store, Microso
 
 <ul>
   <li>
-    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
-program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
-along with collaboration partners working on
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>,
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>,
-<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and
-<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>.
-All of these projects are partially completed or to be completed in early 2025.</p>
+    <p>Проект ЄС <a href="https://nextleap.eu">NEXTLEAP</a> фінансував дослідження та впровадження верифікованих груп і протоколів встановлення контактів у 2017 та 2018 роках, а також допоміг інтегрувати наскрізне шифрування через <a href="https://autocrypt.org">Autocrypt</a>.</p>
+  </li>
+  <li>
+    <p><a href="https://opentechfund.org">Open Technology Fund</a> надав нам два гранти. 
+Перший грант 2018/2019 року (~$200K), допоміг значно покращили додаток для Android
+і випустили першу бета-версію додатка для ПК, і який до того ж
+закріпив наші розробки функцій у дослідженнях UX у контексті прав людини, 
+дивіться наш підсумковий звіт <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
+Другий грант 2019/2020 року (~$300K) допоміг нам 
+випустити Delta/iOS версію, конвертувати нашу основному бібліотеку на Rust,
+і додати нові функції для всіх платформ.</p>
+  </li>
+  <li>
+    <p>Фонд <a href="https://nlnet.nl/">NLnet</a> виділив у 2019/2020 роках 46 тисяч євро на
+завершення прив’язок Rust/Python та запуск екосистеми чат-ботів.</p>
   </li>
   <li>
     <p>In 2021 we received further EU funding for two Next-Generation-Internet
 proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
   </li>
   <li>
-    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
-completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
+    <p>From End 2021 till March 2023 we received <em>Internet Freedom</em> funding (500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supported our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of email servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
   </li>
   <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p>У 2023-2024 роках ми успішно завершили проєкт <a href="https://www.opentech.fund/projects-we-support/supported-projects/secure-chat-mail-with-delta-chat/">Secure Chatmail</a>, що фінансувався OTF, що дозволило нам запровадити гарантоване шифрування, створити <a href="https://delta.chat/chatmail">мережу серверів chatmail</a> та забезпечити “миттєву реєстрацію” у всіх застосунках, випущених з квітня 2024 року.</p>
   </li>
   <li>
-    <p>Проект ЄС <a href="https://nextleap.eu">NEXTLEAP</a> фінансував дослідження та впровадження верифікованих груп і протоколів встановлення контактів у 2017 та 2018 роках, а також допоміг інтегрувати наскрізне шифрування через <a href="https://autocrypt.org">Autocrypt</a>.</p>
+    <p>У 2023 та 2024 роках нас прийняли до програми Next Generation Internet (NGI) за нашу роботу над <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>, а також у співпраці з партнерами, які працюють над <a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>, <a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>, <a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> та <a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>. Усі ці проєкти частково завершені або будуть завершені на початку 2025 року.</p>
   </li>
   <li>
     <p>Іноді ми отримуємо одноразові пожертви від приватних осіб. Наприклад, у 2021 році щедра приватна особа перерахував нам 4 тис. євро з повідомленням «так тримати!». 💜 Ми використовуємо такі пожертви для фінансування зборів на розвиток або для тимчасових витрат, які важко передбачити або відшкодувати за рахунок грантів державного фінансування. Отримання більшої кількості пожертв також допомагає нам стати більш незалежними та довгостроково життєздатними як спільнота контриб’юторів.</p>

src/main/assets/help/zh_CN/help.html

@@ -26,7 +26,6 @@
       <li><a href="#我不小心删除了我自己">我不小心删除了我自己。</a></li>
       <li><a href="#我不想再收到某个群组中的消息了">我不想再收到某个群组中的消息了。</a></li>
       <li><a href="#cloning-a-group">Cloning a group</a></li>
-      <li><a href="#how-many-members-can-participate-in-a-single-group">How many members can participate in a single group?</a></li>
     </ul>
   </li>
   <li><a href="#webxdc">In-chat apps</a>
@@ -55,12 +54,11 @@
   </li>
   <li><a href="#advanced">Advanced</a>
     <ul>
-      <li><a href="#experiments">Experimental Features</a></li>
-      <li><a href="#relays">What are Relays?</a></li>
-      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
-      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as relay?</a></li>
-      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
+      <li><a href="#experimental-features">Experimental Features</a></li>
       <li><a href="#statssending">What is “Send statistics to Delta Chat’s developers”?</a></li>
+      <li><a href="#can-i-use-a-classic-email-address-with-delta-chat">Can I use a classic email address with Delta Chat?</a></li>
+      <li><a href="#classic-email">How can I configure a chat profile with a classic email address as transport?</a></li>
+      <li><a href="#i-want-to-manage-my-own-server-for-delta-chat-what-do-you-recommend">I want to manage my own server for Delta Chat. What do you recommend?</a></li>
       <li><a href="#我对技术细节很感兴趣能告诉我更多吗">我对技术细节很感兴趣。能告诉我更多吗？</a></li>
     </ul>
   </li>
@@ -77,7 +75,6 @@
       <li><a href="#tls">Are messages marked with the mail icon exposed on the Internet?</a></li>
       <li><a href="#message-metadata">Delta Chat 如何保护消息中的元数据？</a></li>
       <li><a href="#device-seizure">当设备被查封时，如何保护元数据和联系人？</a></li>
-      <li><a href="#who-sees-my-ip-address">Who sees my IP Address?</a></li>
       <li><a href="#sealedsender">Does Delta Chat support “Sealed Sender”?</a></li>
       <li><a href="#pfs">Delta Chat 是否支持完美前向保密？</a></li>
       <li><a href="#pqc">Does Delta Chat support Post-Quantum-Cryptography?</a></li>
@@ -187,8 +184,7 @@ If you add each other to <a href="#groups">groups</a>, end-to-end encryption wil
 <p>As being a private messenger,
 only friends and family you <a href="#howtoe2ee">share your QR code or invite link with</a> can write to you.</p>
 
-<p>Your friends may share your contact with other friends,
-this appears as <b style="border: 1px solid currentColor; padding: 0 3px; font-size:90%">Request</b></p>
+<p>Your friends may share your contact with other friends, this appears as a <strong>request</strong>.</p>
 
 <ul>
   <li>
@@ -226,10 +222,15 @@ and can tap it to start chatting with the first contact.</p>
         
       </h3>
 
-<p>是的。 Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
+<ul>
+  <li>
+    <p>是的。 Images, videos, files, voice messages etc. can be sent using the <img style="vertical-align:middle; width:1.0em; margin:1px" src="../paperclip.png" alt="Paperclip" /> <strong>Attachment-</strong>
 or <img style="vertical-align:middle; width:0.8em; margin:1px" src="../mic.png" alt="Microphone" /> <strong>Voice Message</strong> buttons</p>
-
-<p>为了提高性能，默认情况下会对图像进行优化并以较小的尺寸发送，但您也可以将其作为 “文件 “发送，以保留原始图像。</p>
+  </li>
+  <li>
+    <p>为了提高性能，默认情况下会对图像进行优化并以较小的尺寸发送，但您也可以将其作为 “文件 “发送，以保留原始图像。</p>
+  </li>
+</ul>
     
       <h3 id="multiple-accounts">
         
@@ -260,9 +261,14 @@ and uses the server only to relay messages.</p>
         
       </h3>
 
-<p>您可以在设置中添加个人资料图片。如果您给您的联系人发消息或者通过二维码添加他们，他们会自动看到您的个人资料图片。</p>
-
-<p>出于隐私原因，在您向他们发送消息之前，没有人会看到您的个人资料照片。</p>
+<ul>
+  <li>
+    <p>您可以在设置中添加个人资料图片。如果您给您的联系人发消息或者通过二维码添加他们，他们会自动看到您的个人资料图片。</p>
+  </li>
+  <li>
+    <p>出于隐私原因，在您向他们发送消息之前，没有人会看到您的个人资料照片。</p>
+  </li>
+</ul>
     
       <h3 id="signature">
         
@@ -368,18 +374,22 @@ and others will as well not always see that you are “online”.</p>
 <ul>
   <li>
     <p><strong>One tick</strong> <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick1.png" alt="" />
-means that the message was sent successfully to the <a href="#relays">relay</a>.</p>
+means that the message was sent successfully to your provider.</p>
   </li>
   <li>
     <p><strong>Two ticks</strong>  <img style="vertical-align:middle; width:1.5em; margin:1px" src="../tick2.png" alt="" />
-indicate your contact has read the message.</p>
+mean that at least one recipient’s device
+reported back to having received the message.</p>
+  </li>
+  <li>
+    <p>Recipients may have disabled read-receipts,
+so even if you see only one tick, the message may have been read.</p>
+  </li>
+  <li>
+    <p>The other way round, two ticks do not automatically mean
+that a human has read or understood the message ;)</p>
   </li>
 </ul>
-
-<p>In <a href="#groups">groups</a> the second tick means that at least one member has reported back having read the message.</p>
-
-<p>You will only get the second tick if both you and one of the recipients who read the message
-has <strong>Settings → Chats → Read Receipts</strong> enabled.</p>
     
       <h3 id="edit">
         
@@ -445,9 +455,10 @@ the (anyway encrypted) messages may take longer to get deleted from their server
         
       </h3>
 
-<p>若要节省设备上的存储空间，可以开启自动删除旧消息</p>
-
-<p>找到“聊天与媒体”设置中的“从设备删除旧消息”，在从“一小时后”到“一年后”的一系列选项中选择一个。这样，设备上 <em>所有</em> 比所选择时间长度老的消息将被删除</p>
+<ul>
+  <li>若要节省设备上的存储空间，可以开启自动删除旧消息。</li>
+  <li>找到“聊天与媒体”设置中的“从设备删除旧消息”，在从“一小时后”到“一年后”的一系列选项中选择一个。这样，设备上 <em>所有</em> 比所选择时间长度老的消息将被删除。</li>
+</ul>
     
       <h3 id="remove-account">
         
@@ -495,15 +506,9 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
       </h3>
 
 <ul>
-  <li>
-    <p>从右上角的菜单中选择<strong>新建聊天</strong>，然后选择<strong>新建群组</strong>或在 Android/iOS 上点击相应的按钮。</p>
-  </li>
-  <li>
-    <p>在随后的屏幕上，选择<strong>群组成员</strong>并起一个<strong>群组名称</strong>。您也可以选择一个<strong>群组头像</strong>。</p>
-  </li>
-  <li>
-    <p>当您在群组中发送<strong>第一条消息</strong>时，所有成员都会被告知新群组的信息并可以在该群组中应答（只要您不在群组中发送第一条消息，那么群组对成员就是不可见的）。</p>
-  </li>
+  <li>从右上角的菜单中选择<strong>新建聊天</strong>，然后选择<strong>新建群组</strong>或在 Android/iOS 上点击相应的按钮。</li>
+  <li>在随后的屏幕上，选择<strong>群组成员</strong>并起一个<strong>群组名称</strong>。您也可以选择一个<strong>群组头像</strong>。</li>
+  <li>当您在群组中发送<strong>第一条消息</strong>时，所有成员都会被告知新群组的信息并可以在该群组中应答（只要您不在群组中发送第一条消息，那么群组对成员就是不可见的）。</li>
 </ul>
     
       <h3 id="addmembers">
@@ -514,10 +519,11 @@ and <a href="#edit">delete their own messages</a> from all member’s devices.</
         
       </h3>
 
-<p>All group members have the <strong>same rights</strong>.
-For this reason, everyone can delete any member or add new ones.</p>
-
 <ul>
+  <li>
+    <p>All group members have the <strong>same rights</strong>.
+For this reason, everyone can delete any member or add new ones.</p>
+  </li>
   <li>
     <p>To <strong>add or delete members</strong>, tap the group name in the chat and select the member to add or remove.</p>
   </li>
@@ -545,7 +551,9 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
         
       </h3>
 
-<p>由于您不再是群组成员，您无法将自己加入到群组中。但是，问题不大，只需在普通聊天中请求其他群组成员将您重新加入即可。</p>
+<ul>
+  <li>由于您不再是群组成员，您无法将自己加入到群组中。但是，问题不大，只需在普通聊天中请求其他群组成员将您重新加入即可。</li>
+</ul>
     
       <h3 id="我不想再收到某个群组中的消息了">
         
@@ -556,10 +564,13 @@ However, since groups are <a href="#groups">meant for trusted people</a>, avoid
       </h3>
 
 <ul>
-  <li>从成员列表中删除自己，或者删除整个聊天。如果您之后想再加入该群组，请让其他群组成员添加您。</li>
+  <li>
+    <p>从成员列表中删除自己，或者删除整个聊天。如果您之后想再加入该群组，请让其他群组成员添加您。</p>
+  </li>
+  <li>
+    <p>另外，您也可以“静音”群组——这样做意味着您会收到所有消息并且仍可以编写消息，但不会再收到任何新消息的通知。</p>
+  </li>
 </ul>
-
-<p>另外，您也可以“静音”群组——这样做意味着您会收到所有消息并且仍可以编写消息，但不会再收到任何新消息的通知。</p>
     
       <h3 id="cloning-a-group">
         
@@ -585,21 +596,6 @@ or right-click the group in the chat list (Desktop).</p>
 <p>The new group is <strong>fully independent</strong> from the original,
 which continues to work as before.</p>
     
-      <h3 id="how-many-members-can-participate-in-a-single-group">
-        
-        
-          How many members can participate in a single group? <a href="#how-many-members-can-participate-in-a-single-group" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>There is no strict technical limit,
-but more than 150 is not recommended.</p>
-
-<p>As groups get larger, they can become socially unstable and may need a hierarchy -
-where Delta Chat is a private messenger for chatting with <a href="#groups">equal rights</a>.
-See <a href="https://en.wikipedia.org/wiki/Dunbar%27s_number">Dunbar’s number</a> for more insights.</p>
-    
       <h2 id="webxdc">
         
         
@@ -641,7 +637,7 @@ This makes Delta Chat a truly extensible messenger.</p>
     <p>In-chat apps can not send data to the Internet, or download anything.</p>
   </li>
   <li>
-    <p>An in-chat app can only exchange data within a chat, with its
+    <p>An in-chat app can only exchange data within a Delta Chat chat, with its
 copies on the devices of your chat partners. Other than that, it’s completely
 isolated from the Internet.</p>
   </li>
@@ -885,7 +881,7 @@ Welcome to the power of the interoperable chatmail relay network :)</p>
     <p>仔细检查两台设备是否在<strong>同一个 Wi-Fi 或网络中</strong></p>
   </li>
   <li>
-    <p>在 <strong>Windows</strong> 上，转到”控制面板 / 网络和 Internet”
+    <p>在 <strong>Windows</strong> 上，转到<strong>控制面板 / 网络和 Internet</strong>
 并确保<strong>专用网络</strong>被选为“网络配置文件类型”
 （传输后，你可以更改回原始值）</p>
   </li>
@@ -937,16 +933,19 @@ Welcome to the power of the interoperable chatmail relay network :)</p>
 <p>仅当上述“添加第二台设备”方法不起作用时，才建议使用此方法。</p>
 
 <ul>
-  <li>
-    <p>在旧设备上，转到“设置 -&gt; 聊天和媒体 -&gt; 导出备份”。 输入你的 屏幕解锁 PIN 码、图案或密码。 然后你可以点击“开始 备份”。 这会将备份文件保存到你的设备。 现在你必须 以某种方式将其传输到另一台设备。</p>
-  </li>
-  <li>
-    <p>在新设备上，在“我已经有一个配置文件”菜单中，选择“从备份还原”。 导入后，你的对话、加密 密钥和媒体应复制到新设备。
-如果你使用 iOS： 并且你遇到困难，也许 <a href="https://support.delta.chat/t/import-backup-to-ios/1628">本指南</a> 将 帮助你。</p>
-  </li>
+  <li>在旧设备上，转到“设置 -&gt; 聊天和媒体 -&gt; 导出备份”。 输入你的
+屏幕解锁 PIN 码、图案或密码。 然后你可以点击“开始
+备份”。 这会将备份文件保存到你的设备。 现在你必须
+以某种方式将其传输到另一台设备。</li>
+  <li>在新设备上，在“我已经有一个配置文件”菜单中，
+选择“从备份还原”。 导入后，你的对话、加密
+密钥和媒体应复制到新设备。</li>
+  <li><strong>如果你使用 iOS：</strong> 并且你遇到困难，也许
+<a href="https://support.delta.chat/t/import-backup-to-ios/1628">本指南</a> 将
+帮助你。</li>
+  <li>你现在已同步，并且可以使用两台设备与你的通信伙伴发送和接收
+端到端加密消息。</li>
 </ul>
-
-<p>你现在已同步，并且可以使用两台设备与你的通信伙伴发送和接收 端到端加密消息。</p>
     
       <h3 id="有推出-delta-chat-web-客户端的计划吗">
         
@@ -970,10 +969,10 @@ Welcome to the power of the interoperable chatmail relay network :)</p>
         
       </h2>
     
-      <h3 id="experiments">
+      <h3 id="experimental-features">
         
         
-          Experimental Features <a href="#experiments" class="anchor"></a>
+          Experimental Features <a href="#experimental-features" class="anchor"></a>
         
         
       </h3>
@@ -986,44 +985,33 @@ you can try out features we are working on.</p>
 <p>You can find more information
 and give feedback in the <a href="https://support.delta.chat">Forum</a>.</p>
     
-      <h3 id="relays">
+      <h3 id="statssending">
         
         
-          What are Relays? <a href="#relays" class="anchor"></a>
+          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
         
         
       </h3>
 
-<p>Relays are used to temporarily hold messages in case your device is offline.
-Relays are cheap and dumb servers,
-that do not store data as group states, your name or avatar -
-all that exist only on your device.
-Relays are operated by different groups and people.</p>
+<p>We would like to improve Delta Chat with your help,
+which is why Delta Chat for Android asks whether you want
+to send anonymous usage statistics.</p>
 
-<p>By default, after installation, a relay is <strong>automatically set up</strong>,
-so you do not need to care about that.
-However, if you want to,
-you can configure relays at At <strong>Settings → Advanced → Relays</strong>:</p>
+<p>You can turn it on and off at
+<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
+
+<p>When you turn it on,
+weekly statistics will be automatically sent to a bot.</p>
+
+<p>We are interested e.g. in statistics like:</p>
 
 <ul>
-  <li>
-    <p>You can <strong>add</strong> a relay by scanning its QR code;
-<a href="https://chatmail.at/relays">https://chatmail.at/relays</a> shows some known ones.
-If you have multiple relays, you will receive messages on all of them.</p>
-  </li>
-  <li>
-    <p>The <strong>default</strong> defines the one where your chat partners send future messages to.</p>
-  </li>
-  <li>
-    <p>If you <strong>remove</strong> a relay,
-make sure another default relay was used for a sufficient amount of time.
-Otherwise, messages from your chat partners won’t reach you.
-If in doubt, remove later.</p>
-  </li>
+  <li>How many contacts are introduced by personally scanning a QR code?</li>
+  <li>Which versions of Delta Chat are being used?</li>
+  <li>How many messages are unencrypted?</li>
 </ul>
 
-<p>For more details and future possibilities of relays,
-you can follow discussions in the <a href="https://support.delta.chat">Forum</a>.</p>
+<p>We will <em>not</em> collect any personally identifiable information about you.</p>
     
       <h3 id="can-i-use-a-classic-email-address-with-delta-chat">
         
@@ -1045,7 +1033,7 @@ while chatmail apps and relays pervasively enforce end-to-end encryption and sec
   </li>
   <li>
     <p>Non-chatmail apps use email servers as a long-term message archive
-while chatmail clients use email servers for ephemeral instant message relay.</p>
+while chatmail clients use email servers for ephemeral instant message transport.</p>
   </li>
   <li>
     <p>Supporting the full variety of classic email setups
@@ -1057,7 +1045,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
       <h3 id="classic-email">
         
         
-          How can I configure a chat profile with a classic email address as relay? <a href="#classic-email" class="anchor"></a>
+          How can I configure a chat profile with a classic email address as transport? <a href="#classic-email" class="anchor"></a>
         
         
       </h3>
@@ -1066,7 +1054,7 @@ and complicate making chatmail-based messaging more resilient, reliable and fast
 unless you are prepared to deal with encrypted messages in the inbox,
 double notifications, accidentally deleted emails or similar annoyances.</p>
 
-<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Relay</strong>.
+<p>You can configure a email address for chatting at <strong>New Profile → Use Other Server → Use Classic Mail as Transport</strong>.
 Note that classic email providers will generally not support <a href="#instant-delivery">Push Notifications</a>
 and have other limitations, see <a href="https://providers.delta.chat">Provider Overview</a>.
 Chatmail uses the default INBOX for relay; ensure the provider setup does too. 
@@ -1090,40 +1078,6 @@ except if your users’ devices require Google/Apple <a href="#instant-delivery"
 and <a href="https://github.com/chatmail/core">core Rust developments</a> 
 that power <a href="https://chatmail.at/clients">chatmail clients</a> of which Delta Chat is the most well known.</p>
     
-      <h3 id="statssending">
-        
-        
-          What is “Send statistics to Delta Chat’s developers”? <a href="#statssending" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>We would like to improve Delta Chat with your help,
-which is why Delta Chat for Android asks whether you want
-to send anonymous usage statistics.</p>
-
-<p>You can turn it on and off at
-<strong>Settings → Advanced → Send statistics to Delta Chat’s developers</strong>.</p>
-
-<p>When you turn it on,
-weekly statistics will be automatically sent to a bot.</p>
-
-<p>We are interested e.g. in statistics like:</p>
-
-<ul>
-  <li>
-    <p>How many contacts are introduced by personally scanning a QR code?</p>
-  </li>
-  <li>
-    <p>Which versions of Delta Chat are being used?</p>
-  </li>
-  <li>
-    <p>What errors occur for users?</p>
-  </li>
-</ul>
-
-<p>We will <em>not</em> collect any personally identifiable information about you.</p>
-    
       <h3 id="我对技术细节很感兴趣能告诉我更多吗">
         
         
@@ -1132,7 +1086,9 @@ weekly statistics will be automatically sent to a bot.</p>
         
       </h3>
 
-<p>请参阅 <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Delta Chat 中使用的标准</a>。</p>
+<ul>
+  <li>请参阅 <a href="https://github.com/chatmail/core/blob/main/standards.md#standards-used-in-delta-chat">Delta Chat 中使用的标准</a>。</li>
+</ul>
     
       <h2 id="e2ee">
         
@@ -1368,32 +1324,6 @@ with the knowledge that all their data, along with all metadata, will be deleted
 Moreover, if a device is seized then chat contacts using short-lived profiles
 can not be identified easily.</p>
     
-      <h3 id="who-sees-my-ip-address">
-        
-        
-          Who sees my IP Address? <a href="#who-sees-my-ip-address" class="anchor"></a>
-        
-        
-      </h3>
-
-<p>The used <a href="#relays">relay</a> needs to know your IP Address,
-as well as sometimes your contact’s devices if you have a <a href="#experiments">call</a>
-or use <a href="#webxdc">apps</a> together.</p>
-
-<p>IP Addresses are needed for connectivity and efficiency.
-They are neither persisted nor exposed.
-Note that the IP Address
-is not like a detailed address you give to a delivery service,
-but much more coarse, often defining region or country only.</p>
-
-<p>As this is just how the internet and other messengers work by default,
-we do not offer options here or ask upfront questions.</p>
-
-<p>If you see your IP Address as a security or privacy risk,
-we recommend to use a VPN, in combination with system lockdown mode.
-Hunting down options in all apps on your system will leave gaps.
-For example, tapping a link exposes IP Addresses to unknown parties and is the by far larger risk here.</p>
-    
       <h3 id="sealedsender">
         
         
@@ -1480,12 +1410,12 @@ Delta Chat 在此处显示两个指纹。
 
 <p>不。</p>
 
-<p>Delta Chat generates secure OpenPGP keys according to the Autocrypt specification 1.1.
-We do not recommend or offer users to perform manual key management.
-We want to ensure that security audits can focus on a few proven cryptographic algorithms
-instead of the full breadth of possible algorithms allowed with OpenPGP.
-If you want to extract your OpenPGP key, there only is an expert method:
-you need to look it up in the “keypairs” SQLite table of a profile backup tar-file.</p>
+<p>Delta Chat 采用 Autocrypt 1.1 标准规范生成 OpenPGP 加密密钥。
+用户虽可导出自身私钥进行备份，但系统设计上不支持导入其他私钥。</p>
+
+<p>基于安全考量，系统默认不开放手动密钥管理功能。
+此项设计旨在让安全审计工作聚焦于少量成熟加密算法（如 Autocrypt 标准），
+避免因支持 OpenPGP 协议所允许的所有算法而增加潜在安全风险。</p>
     
       <h3 id="security-audits">
         
@@ -1624,35 +1554,40 @@ Google Play Store, F-Droid, Huawei App Gallery, iOS and macOS App Store, Microso
 
 <ul>
   <li>
-    <p>In 2023 and 2024 we got accepted in the Next Generation Internet (NGI)
-program for our work in <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a>,
-along with collaboration partners working on
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>,
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>,
-<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> and
-<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>.
-All of these projects are partially completed or to be completed in early 2025.</p>
+    <p><a href="https://nextleap.eu">NEXTLEAP</a>欧盟项目资助了以下研究和实施工作：在 2017 年和 2018 年实施的验证组和设置联系协议和通过 <a href="https://autocrypt.org">Autocrypt</a>整合了端到端加密。</p>
+  </li>
+  <li>
+    <p>在<a href="https://opentechfund.org">开放技术基金</a> 2018/2019 年提供的第一笔赠款（约 20 万美元）期间，我们显著改善了安卓应用，发布了第一个桌面测试版，并根据人权方面的用户体验研究进行了功能开发，请参阅我们的结论<a href="https://delta.chat/en/2019-07-19-uxreport">《需求发现与用户体验报告》</a>。2019/2020 年的第二笔赠款（约 30 万美元）对发布 Delta/iOS 版本，将核心库转换到 Rust ，以及为所有平台开发新功能提供了帮助。</p>
+  </li>
+  <li>
+    <p><a href="https://nlnet.nl/">NLnet 基金会</a> 2019/2020 年拨款 4.6 万欧元，用于完成 Rust/Python 绑定并建立聊天机器人生态系统。</p>
   </li>
   <li>
     <p>In 2021 we received further EU funding for two Next-Generation-Internet
 proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - email provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-profile support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
   </li>
   <li>
-    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
-completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
+    <p>From End 2021 till March 2023 we received <em>Internet Freedom</em> funding (500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supported our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of email servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
   </li>
   <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a
-first 2018/2019 grant (~$200K) during which we majorly improved the Android app
-and released a first Desktop app beta version, and which moreover
-moored our feature developments in UX research in human rights contexts,
-see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) helped us to
-release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.</p>
+    <p>2023-2024 年，我们成功完成了 OTF 资助的
+<a href="https://www.opentech.fund/projects-we-support/supported-projects/secure-chat-mail-with-delta-chat/">安全 Chatmail 项目</a>，
+使我们能够引入保证的加密，
+创建一个 <a href="https://delta.chat/chatmail">Chatmail 服务器网络</a>，
+并在 2024 年 4 月起发布的所有应用中提供“即时入职”。</p>
   </li>
   <li>
-    <p><a href="https://nextleap.eu">NEXTLEAP</a>欧盟项目资助了以下研究和实施工作：在 2017 年和 2018 年实施的验证组和设置联系协议和通过 <a href="https://autocrypt.org">Autocrypt</a>整合了端到端加密。</p>
+    <p>在 2023 年和 2024 年，我们的 <a href="https://nlnet.nl/project/WebXDC-Push/">WebXDC PUSH</a> 工作已在下一代互联网 (NGI) 中获得认可，
+并与致力于
+<a href="https://nlnet.nl/project/Webxdc-Evolve/">WebXDC evolve</a>、
+<a href="https://nlnet.nl/project/WebXDC-XMPP/">WebXDC XMPP</a>、
+<a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> 和
+<a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a> 的合作伙伴合作。
+所有这些项目都已部分完成或将在 2025 年初完成。</p>
   </li>
   <li>
     <p>我们有时会收到个人的一次性捐款。 例如，2021 年，一位慷慨的人士以 “继续保持良好的发展态势！”为主题通过银行向我们捐赠了4千欧元💜。 我们用这些钱来资助发展活动或支付不容易预测或从公共基金中报销的临时费用。收到更多的捐款也有助于我们作为一个贡献者社区变得更加独立和长期可持续。</p>

src/main/java/chat/delta/rpc/BaseTransport.java

@@ -94,7 +94,7 @@ public abstract class BaseTransport implements Rpc.Transport {
     }
 
     if (response.error != null) {
-      future.setException(new RpcException(response.error.message));
+      future.setException(new RpcException(response.error.toString()));
     } else if (response.result != null) {
       future.set(response.result);
     } else {
@@ -115,15 +115,10 @@ public abstract class BaseTransport implements Rpc.Transport {
     }
   }
 
-  private static class RpcError {
-    public int code;
-    public String message;
-  }
-
   private static class Response {
     public String jsonrpc;
     public int id;
     public JsonNode result;
-    public RpcError error;
+    public JsonNode error;
   }
 }

src/main/java/chat/delta/rpc/Rpc.java

@@ -23,17 +23,17 @@ public class Rpc {
     this.mapper = transport.getObjectMapper();
   }
 
-  /** Test function. */
+  /* Test function. */
   public void sleep(Float delay) throws RpcException {
     transport.call("sleep", mapper.valueToTree(delay));
   }
 
-  /** Checks if an email address is valid. */
+  /* Checks if an email address is valid. */
   public Boolean checkEmailValidity(String email) throws RpcException {
     return transport.callForResult(new TypeReference<Boolean>(){}, "check_email_validity", mapper.valueToTree(email));
   }
 
-  /** Returns general system info. */
+  /* Returns general system info. */
   public java.util.Map<String, String> getSystemInfo() throws RpcException {
     return transport.callForResult(new TypeReference<java.util.Map<String, String>>(){}, "get_system_info");
   }
@@ -73,12 +73,12 @@ public class Rpc {
     return transport.callForResult(new TypeReference<java.util.List<Integer>>(){}, "get_all_account_ids");
   }
 
-  /** Select account in account manager, this saves the last used account to accounts.toml */
+  /* Select account in account manager, this saves the last used account to accounts.toml */
   public void selectAccount(Integer id) throws RpcException {
     transport.call("select_account", mapper.valueToTree(id));
   }
 
-  /** Get the selected account from the account manager (on startup it is read from accounts.toml) */
+  /* Get the selected account from the account manager (on startup it is read from accounts.toml) */
   public Integer getSelectedAccountId() throws RpcException {
     return transport.callForResult(new TypeReference<Integer>(){}, "get_selected_account_id");
   }
@@ -93,17 +93,17 @@ public class Rpc {
     transport.call("set_accounts_order", mapper.valueToTree(order));
   }
 
-  /** Get a list of all configured accounts. */
+  /* Get a list of all configured accounts. */
   public java.util.List<Account> getAllAccounts() throws RpcException {
     return transport.callForResult(new TypeReference<java.util.List<Account>>(){}, "get_all_accounts");
   }
 
-  /** Starts background tasks for all accounts. */
+  /* Starts background tasks for all accounts. */
   public void startIoForAllAccounts() throws RpcException {
     transport.call("start_io_for_all_accounts");
   }
 
-  /** Stops background tasks for all accounts. */
+  /* Stops background tasks for all accounts. */
   public void stopIoForAllAccounts() throws RpcException {
     transport.call("stop_io_for_all_accounts");
   }
@@ -123,27 +123,27 @@ public class Rpc {
     transport.call("stop_background_fetch");
   }
 
-  /** Starts background tasks for a single account. */
+  /* Starts background tasks for a single account. */
   public void startIo(Integer accountId) throws RpcException {
     transport.call("start_io", mapper.valueToTree(accountId));
   }
 
-  /** Stops background tasks for a single account. */
+  /* Stops background tasks for a single account. */
   public void stopIo(Integer accountId) throws RpcException {
     transport.call("stop_io", mapper.valueToTree(accountId));
   }
 
-  /** Get top-level info for an account. */
+  /* Get top-level info for an account. */
   public Account getAccountInfo(Integer accountId) throws RpcException {
     return transport.callForResult(new TypeReference<Account>(){}, "get_account_info", mapper.valueToTree(accountId));
   }
 
-  /** Get the current push notification state. */
+  /* Get the current push notification state. */
   public NotifyState getPushState(Integer accountId) throws RpcException {
     return transport.callForResult(new TypeReference<NotifyState>(){}, "get_push_state", mapper.valueToTree(accountId));
   }
 
-  /** Get the combined filesize of an account in bytes */
+  /* Get the combined filesize of an account in bytes */
   public Integer getAccountFileSize(Integer accountId) throws RpcException {
     return transport.callForResult(new TypeReference<Integer>(){}, "get_account_file_size", mapper.valueToTree(accountId));
   }
@@ -160,22 +160,22 @@ public class Rpc {
     return transport.callForResult(new TypeReference<ProviderInfo>(){}, "get_provider_info", mapper.valueToTree(accountId), mapper.valueToTree(email));
   }
 
-  /** Checks if the context is already configured. */
+  /* Checks if the context is already configured. */
   public Boolean isConfigured(Integer accountId) throws RpcException {
     return transport.callForResult(new TypeReference<Boolean>(){}, "is_configured", mapper.valueToTree(accountId));
   }
 
-  /** Get system info for an account. */
+  /* Get system info for an account. */
   public java.util.Map<String, String> getInfo(Integer accountId) throws RpcException {
     return transport.callForResult(new TypeReference<java.util.Map<String, String>>(){}, "get_info", mapper.valueToTree(accountId));
   }
 
-  /** Get storage usage report as formatted string */
+  /* Get storage usage report as formatted string */
   public String getStorageUsageReportString(Integer accountId) throws RpcException {
     return transport.callForResult(new TypeReference<String>(){}, "get_storage_usage_report_string", mapper.valueToTree(accountId));
   }
 
-  /** Get the blob dir. */
+  /* Get the blob dir. */
   public String getBlobDir(Integer accountId) throws RpcException {
     return transport.callForResult(new TypeReference<String>(){}, "get_blob_dir", mapper.valueToTree(accountId));
   }
@@ -195,27 +195,27 @@ public class Rpc {
     return transport.callForResult(new TypeReference<String>(){}, "get_migration_error", mapper.valueToTree(accountId));
   }
 
-  /** Copy file to blob dir. */
+  /* Copy file to blob dir. */
   public String copyToBlobDir(Integer accountId, String path) throws RpcException {
     return transport.callForResult(new TypeReference<String>(){}, "copy_to_blob_dir", mapper.valueToTree(accountId), mapper.valueToTree(path));
   }
 
-  /** Sets the given configuration key. */
+  /* Sets the given configuration key. */
   public void setConfig(Integer accountId, String key, String value) throws RpcException {
     transport.call("set_config", mapper.valueToTree(accountId), mapper.valueToTree(key), mapper.valueToTree(value));
   }
 
-  /** Updates a batch of configuration values. */
+  /* Updates a batch of configuration values. */
   public void batchSetConfig(Integer accountId, java.util.Map<String, String> config) throws RpcException {
     transport.call("batch_set_config", mapper.valueToTree(accountId), mapper.valueToTree(config));
   }
 
   /**
-   * Set configuration values from a QR code (technically from the URI stored in it).
-   * Before this function is called, `check_qr()` should be used to get the QR code type.
+   * Set configuration values from a QR code. (technically from the URI that is stored in the qrcode)
+   * Before this function is called, `checkQr()` should confirm the type of the
+   * QR code is `account` or `webrtcInstance`.
    * <p>
-   * "DCACCOUNT:" and "DCLOGIN:" QR codes configure the account, but I/O mustn't be started for
-   * such QR codes, consider using [`Self::add_transport_from_qr`] which also restarts I/O.
+   * Internally, the function will call dc_set_config() with the appropriate keys,
    */
   public void setConfigFromQr(Integer accountId, String qrContent) throws RpcException {
     transport.call("set_config_from_qr", mapper.valueToTree(accountId), mapper.valueToTree(qrContent));
@@ -225,7 +225,7 @@ public class Rpc {
     return transport.callForResult(new TypeReference<Qr>(){}, "check_qr", mapper.valueToTree(accountId), mapper.valueToTree(qrContent));
   }
 
-  /** Returns configuration value for the given key. */
+  /* Returns configuration value for the given key. */
   public String getConfig(Integer accountId, String key) throws RpcException {
     return transport.callForResult(new TypeReference<String>(){}, "get_config", mapper.valueToTree(accountId), mapper.valueToTree(key));
   }
@@ -234,11 +234,6 @@ public class Rpc {
     return transport.callForResult(new TypeReference<java.util.Map<String, String>>(){}, "batch_get_config", mapper.valueToTree(accountId), mapper.valueToTree(keys));
   }
 
-  /** Returns all `ui.*` config keys that were set by the UI. */
-  public java.util.List<String> getAllUiConfigKeys(Integer accountId) throws RpcException {
-    return transport.callForResult(new TypeReference<java.util.List<String>>(){}, "get_all_ui_config_keys", mapper.valueToTree(accountId));
-  }
-
   public void setStockStrings(java.util.Map<String, String> strings) throws RpcException {
     transport.call("set_stock_strings", mapper.valueToTree(strings));
   }
@@ -289,7 +284,7 @@ public class Rpc {
     transport.call("add_or_update_transport", mapper.valueToTree(accountId), mapper.valueToTree(param));
   }
 
-  /** Deprecated 2025-04. Alias for [Self::add_or_update_transport()]. */
+  /* Deprecated 2025-04. Alias for [Self::add_or_update_transport()]. */
   public void addTransport(Integer accountId, EnteredLoginParam param) throws RpcException {
     transport.call("add_transport", mapper.valueToTree(accountId), mapper.valueToTree(param));
   }
@@ -320,7 +315,7 @@ public class Rpc {
     transport.call("delete_transport", mapper.valueToTree(accountId), mapper.valueToTree(addr));
   }
 
-  /** Signal an ongoing process to stop. */
+  /* Signal an ongoing process to stop. */
   public void stopOngoingProcess(Integer accountId) throws RpcException {
     transport.call("stop_ongoing_process", mapper.valueToTree(accountId));
   }
@@ -454,11 +449,11 @@ public class Rpc {
    * Delete a chat.
    * <p>
    * Messages are deleted from the device and the chat database entry is deleted.
-   * After that, a `MsgsChanged` event is emitted.
-   * Messages are deleted from the server in background.
+   * After that, the event #DC_EVENT_MSGS_CHANGED is posted.
    * <p>
    * Things that are _not done_ implicitly:
    * <p>
+   * - Messages are **not deleted from the server**.
    * - The chat or the contact is **not blocked**, so new messages from the user/the group may appear as a contact request
    * and the user may create the chat again.
    * - **Groups are not left** - this would
@@ -613,7 +608,7 @@ public class Rpc {
     return transport.callForResult(new TypeReference<java.util.List<Integer>>(){}, "get_chat_contacts", mapper.valueToTree(accountId), mapper.valueToTree(chatId));
   }
 
-  /** Returns contact IDs of the past chat members. */
+  /* Returns contact IDs of the past chat members. */
   public java.util.List<Integer> getPastChatContacts(Integer accountId, Integer chatId) throws RpcException {
     return transport.callForResult(new TypeReference<java.util.List<Integer>>(){}, "get_past_chat_contacts", mapper.valueToTree(accountId), mapper.valueToTree(chatId));
   }
@@ -652,7 +647,7 @@ public class Rpc {
     return transport.callForResult(new TypeReference<Integer>(){}, "create_group_chat_unencrypted", mapper.valueToTree(accountId), mapper.valueToTree(name));
   }
 
-  /** Deprecated 2025-07 in favor of create_broadcast(). */
+  /* Deprecated 2025-07 in favor of create_broadcast(). */
   public Integer createBroadcastList(Integer accountId) throws RpcException {
     return transport.callForResult(new TypeReference<Integer>(){}, "create_broadcast_list", mapper.valueToTree(accountId));
   }
@@ -738,26 +733,11 @@ public class Rpc {
     return transport.callForResult(new TypeReference<Integer>(){}, "add_device_message", mapper.valueToTree(accountId), mapper.valueToTree(label), mapper.valueToTree(msg));
   }
 
-  /**
-   * Mark all messages in all chats as _noticed_.
-   * Skips messages from blocked contacts, but does not skip messages in muted chats.
-   * <p>
-   * _Noticed_ messages are no longer _fresh_ and do not count as being unseen
-   * but are still waiting for being marked as "seen" using markseen_msgs()
-   * (read receipts aren't sent for noticed messages).
-   * <p>
-   * Calling this function usually results in the event #DC_EVENT_MSGS_NOTICED.
-   * See also markseen_msgs().
-   */
-  public void marknoticedAllChats(Integer accountId) throws RpcException {
-    transport.call("marknoticed_all_chats", mapper.valueToTree(accountId));
-  }
-
   /**
    * Mark all messages in a chat as _noticed_.
    * _Noticed_ messages are no longer _fresh_ and do not count as being unseen
    * but are still waiting for being marked as "seen" using markseen_msgs()
-   * (read receipts aren't sent for noticed messages).
+   * (IMAP/MDNs is not done for noticed messages).
    * <p>
    * Calling this function usually results in the event #DC_EVENT_MSGS_NOTICED.
    * See also markseen_msgs().
@@ -876,7 +856,7 @@ public class Rpc {
     return transport.callForResult(new TypeReference<java.util.Map<String, MessageLoadResult>>(){}, "get_messages", mapper.valueToTree(accountId), mapper.valueToTree(messageIds));
   }
 
-  /** Fetch info desktop needs for creating a notification for a message */
+  /* Fetch info desktop needs for creating a notification for a message */
   public MessageNotificationInfo getMessageNotificationInfo(Integer accountId, Integer messageId) throws RpcException {
     return transport.callForResult(new TypeReference<MessageNotificationInfo>(){}, "get_message_notification_info", mapper.valueToTree(accountId), mapper.valueToTree(messageId));
   }
@@ -908,21 +888,12 @@ public class Rpc {
     return transport.callForResult(new TypeReference<String>(){}, "get_message_info", mapper.valueToTree(accountId), mapper.valueToTree(messageId));
   }
 
-  /** Returns additional information for single message. */
+  /* Returns additional information for single message. */
   public MessageInfo getMessageInfoObject(Integer accountId, Integer messageId) throws RpcException {
     return transport.callForResult(new TypeReference<MessageInfo>(){}, "get_message_info_object", mapper.valueToTree(accountId), mapper.valueToTree(messageId));
   }
 
-  /**
-   * Returns count of read receipts on message.
-   * <p>
-   * This view count is meant as a feedback measure for the channel owner only.
-   */
-  public Integer getMessageReadReceiptCount(Integer accountId, Integer messageId) throws RpcException {
-    return transport.callForResult(new TypeReference<Integer>(){}, "get_message_read_receipt_count", mapper.valueToTree(accountId), mapper.valueToTree(messageId));
-  }
-
-  /** Returns contacts that sent read receipts and the time of reading. */
+  /* Returns contacts that sent read receipts and the time of reading. */
   public java.util.List<MessageReadReceipt> getMessageReadReceipts(Integer accountId, Integer messageId) throws RpcException {
     return transport.callForResult(new TypeReference<java.util.List<MessageReadReceipt>>(){}, "get_message_read_receipts", mapper.valueToTree(accountId), mapper.valueToTree(messageId));
   }
@@ -970,7 +941,7 @@ public class Rpc {
     transport.call("save_msgs", mapper.valueToTree(accountId), mapper.valueToTree(messageIds));
   }
 
-  /** Get a single contact options by ID. */
+  /* Get a single contact options by ID. */
   public Contact getContact(Integer accountId, Integer contactId) throws RpcException {
     return transport.callForResult(new TypeReference<Contact>(){}, "get_contact", mapper.valueToTree(accountId), mapper.valueToTree(contactId));
   }
@@ -991,7 +962,7 @@ public class Rpc {
     return transport.callForResult(new TypeReference<Integer>(){}, "create_contact", mapper.valueToTree(accountId), mapper.valueToTree(email), mapper.valueToTree(name));
   }
 
-  /** Returns contact id of the created or existing DM chat with that contact */
+  /* Returns contact id of the created or existing DM chat with that contact */
   public Integer createChatByContactId(Integer accountId, Integer contactId) throws RpcException {
     return transport.callForResult(new TypeReference<Integer>(){}, "create_chat_by_contact_id", mapper.valueToTree(accountId), mapper.valueToTree(contactId));
   }
@@ -1040,7 +1011,7 @@ public class Rpc {
     transport.call("delete_contact", mapper.valueToTree(accountId), mapper.valueToTree(contactId));
   }
 
-  /** Sets display name for existing contact. */
+  /* Sets display name for existing contact. */
   public void changeContactName(Integer accountId, Integer contactId, String name) throws RpcException {
     transport.call("change_contact_name", mapper.valueToTree(accountId), mapper.valueToTree(contactId), mapper.valueToTree(name));
   }
@@ -1075,7 +1046,7 @@ public class Rpc {
     return transport.callForResult(new TypeReference<Integer>(){}, "lookup_contact_id_by_addr", mapper.valueToTree(accountId), mapper.valueToTree(addr));
   }
 
-  /** Parses a vCard file located at the given path. Returns contacts in their original order. */
+  /* Parses a vCard file located at the given path. Returns contacts in their original order. */
   public java.util.List<VcardContact> parseVcard(String path) throws RpcException {
     return transport.callForResult(new TypeReference<java.util.List<VcardContact>>(){}, "parse_vcard", mapper.valueToTree(path));
   }
@@ -1098,12 +1069,12 @@ public class Rpc {
     return transport.callForResult(new TypeReference<java.util.List<Integer>>(){}, "import_vcard_contents", mapper.valueToTree(accountId), mapper.valueToTree(vcard));
   }
 
-  /** Returns a vCard containing contacts with the given ids. */
+  /* Returns a vCard containing contacts with the given ids. */
   public String makeVcard(Integer accountId, java.util.List<Integer> contacts) throws RpcException {
     return transport.callForResult(new TypeReference<String>(){}, "make_vcard", mapper.valueToTree(accountId), mapper.valueToTree(contacts));
   }
 
-  /** Sets vCard containing the given contacts to the message draft. */
+  /* Sets vCard containing the given contacts to the message draft. */
   public void setDraftVcard(Integer accountId, Integer msgId, java.util.List<Integer> contacts) throws RpcException {
     transport.call("set_draft_vcard", mapper.valueToTree(accountId), mapper.valueToTree(msgId), mapper.valueToTree(contacts));
   }
@@ -1274,7 +1245,7 @@ public class Rpc {
     return transport.callForResult(new TypeReference<String>(){}, "get_webxdc_status_updates", mapper.valueToTree(accountId), mapper.valueToTree(instanceMsgId), mapper.valueToTree(lastKnownSerial));
   }
 
-  /** Get info from a webxdc message */
+  /* Get info from a webxdc message */
   public WebxdcMessageInfo getWebxdcInfo(Integer accountId, Integer instanceMsgId) throws RpcException {
     return transport.callForResult(new TypeReference<WebxdcMessageInfo>(){}, "get_webxdc_info", mapper.valueToTree(accountId), mapper.valueToTree(instanceMsgId));
   }
@@ -1314,27 +1285,27 @@ public class Rpc {
     return transport.callForResult(new TypeReference<Integer>(){}, "init_webxdc_integration", mapper.valueToTree(accountId), mapper.valueToTree(chatId));
   }
 
-  /** Starts an outgoing call. */
+  /* Starts an outgoing call. */
   public Integer placeOutgoingCall(Integer accountId, Integer chatId, String placeCallInfo) throws RpcException {
     return transport.callForResult(new TypeReference<Integer>(){}, "place_outgoing_call", mapper.valueToTree(accountId), mapper.valueToTree(chatId), mapper.valueToTree(placeCallInfo));
   }
 
-  /** Accepts an incoming call. */
+  /* Accepts an incoming call. */
   public void acceptIncomingCall(Integer accountId, Integer msgId, String acceptCallInfo) throws RpcException {
     transport.call("accept_incoming_call", mapper.valueToTree(accountId), mapper.valueToTree(msgId), mapper.valueToTree(acceptCallInfo));
   }
 
-  /** Ends incoming or outgoing call. */
+  /* Ends incoming or outgoing call. */
   public void endCall(Integer accountId, Integer msgId) throws RpcException {
     transport.call("end_call", mapper.valueToTree(accountId), mapper.valueToTree(msgId));
   }
 
-  /** Returns information about the call. */
+  /* Returns information about the call. */
   public CallInfo callInfo(Integer accountId, Integer msgId) throws RpcException {
     return transport.callForResult(new TypeReference<CallInfo>(){}, "call_info", mapper.valueToTree(accountId), mapper.valueToTree(msgId));
   }
 
-  /** Returns JSON with ICE servers, to be used for WebRTC video calls. */
+  /* Returns JSON with ICE servers, to be used for WebRTC video calls. */
   public String iceServers(Integer accountId) throws RpcException {
     return transport.callForResult(new TypeReference<String>(){}, "ice_servers", mapper.valueToTree(accountId));
   }
@@ -1360,14 +1331,6 @@ public class Rpc {
     transport.call("forward_messages", mapper.valueToTree(accountId), mapper.valueToTree(messageIds), mapper.valueToTree(chatId));
   }
 
-  /**
-   * Forward messages to a chat in another account.
-   * See [`Self::forward_messages`] for more info.
-   */
-  public void forwardMessagesToAccount(Integer srcAccountId, java.util.List<Integer> srcMessageIds, Integer dstAccountId, Integer dstChatId) throws RpcException {
-    transport.call("forward_messages_to_account", mapper.valueToTree(srcAccountId), mapper.valueToTree(srcMessageIds), mapper.valueToTree(dstAccountId), mapper.valueToTree(dstChatId));
-  }
-
   /**
    * Resend messages and make information available for newly added chat members.
    * Resending sends out the original message, however, recipients and webxdc-status may differ.
@@ -1398,7 +1361,7 @@ public class Rpc {
     return transport.callForResult(new TypeReference<Integer>(){}, "send_reaction", mapper.valueToTree(accountId), mapper.valueToTree(messageId), mapper.valueToTree(reaction));
   }
 
-  /** Returns reactions to the message. */
+  /* Returns reactions to the message. */
   public Reactions getMessageReactions(Integer accountId, Integer messageId) throws RpcException {
     return transport.callForResult(new TypeReference<Reactions>(){}, "get_message_reactions", mapper.valueToTree(accountId), mapper.valueToTree(messageId));
   }
@@ -1411,7 +1374,7 @@ public class Rpc {
     transport.call("send_edit_request", mapper.valueToTree(accountId), mapper.valueToTree(msgId), mapper.valueToTree(newText));
   }
 
-  /** Checks if messages can be sent to a given chat. */
+  /* Checks if messages can be sent to a given chat. */
   public Boolean canSend(Integer accountId, Integer chatId) throws RpcException {
     return transport.callForResult(new TypeReference<Boolean>(){}, "can_send", mapper.valueToTree(accountId), mapper.valueToTree(chatId));
   }
@@ -1429,7 +1392,7 @@ public class Rpc {
     transport.call("remove_draft", mapper.valueToTree(accountId), mapper.valueToTree(chatId));
   }
 
-  /** Get draft for a chat, if any. */
+  /* Get draft for a chat, if any. */
   public Message getDraft(Integer accountId, Integer chatId) throws RpcException {
     return transport.callForResult(new TypeReference<Message>(){}, "get_draft", mapper.valueToTree(accountId), mapper.valueToTree(chatId));
   }
@@ -1438,7 +1401,7 @@ public class Rpc {
     return transport.callForResult(new TypeReference<String>(){}, "misc_get_sticker_folder", mapper.valueToTree(accountId));
   }
 
-  /** Saves a sticker to a collection/folder in the account's sticker folder. */
+  /* Saves a sticker to a collection/folder in the account's sticker folder. */
   public void miscSaveSticker(Integer accountId, Integer msgId, String collection) throws RpcException {
     transport.call("misc_save_sticker", mapper.valueToTree(accountId), mapper.valueToTree(msgId), mapper.valueToTree(collection));
   }
@@ -1451,7 +1414,7 @@ public class Rpc {
     return transport.callForResult(new TypeReference<java.util.Map<String, java.util.List<String>>>(){}, "misc_get_stickers", mapper.valueToTree(accountId));
   }
 
-  /** Returns the messageid of the sent message */
+  /* Returns the messageid of the sent message */
   public Integer miscSendTextMessage(Integer accountId, Integer chatId, String text) throws RpcException {
     return transport.callForResult(new TypeReference<Integer>(){}, "misc_send_text_message", mapper.valueToTree(accountId), mapper.valueToTree(chatId), mapper.valueToTree(text));
   }

src/main/java/chat/delta/rpc/types/Account.java

@@ -18,7 +18,7 @@ public abstract class Account {
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public String displayName;
     public Integer id;
-    /** Optional tag as "Work", "Family". Meant to help profile owner to differ between profiles with similar names. */
+    /* Optional tag as "Work", "Family". Meant to help profile owner to differ between profiles with similar names. */
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public String privateTag;
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)

src/main/java/chat/delta/rpc/types/BasicChat.java

@@ -2,7 +2,7 @@
 package chat.delta.rpc.types;
 
 /**
- * cheaper version of fullchat, omits: - contact_ids - fresh_message_counter - ephemeral_timer - self_in_group - was_seen_recently - can_send
+ * cheaper version of fullchat, omits: - contacts - contact_ids - fresh_message_counter - ephemeral_timer - self_in_group - was_seen_recently - can_send
  * <p>
  * used when you only need the basic metadata of a chat like type, name, profile picture
  */

src/main/java/chat/delta/rpc/types/CallInfo.java

@@ -2,7 +2,7 @@
 package chat.delta.rpc.types;
 
 public class CallInfo {
-  /** True if SDP offer has a video. */
+  /* True if SDP offer has a video. */
   public Boolean hasVideo;
   /**
    * SDP offer.

src/main/java/chat/delta/rpc/types/CallState.java

@@ -19,21 +19,21 @@ public abstract class CallState {
   public static class Alerting extends CallState {
   }
 
-/** Active call. */
+/* Active call. */
   public static class Active extends CallState {
   }
 
-/** Completed call that was once active and then was terminated for any reason. */
+/* Completed call that was once active and then was terminated for any reason. */
   public static class Completed extends CallState {
-    /** Call duration in seconds. */
+    /* Call duration in seconds. */
     public Integer duration;
   }
 
-/** Incoming call that was not picked up within a timeout or was explicitly ended by the caller before we picked up. */
+/* Incoming call that was not picked up within a timeout or was explicitly ended by the caller before we picked up. */
   public static class Missed extends CallState {
   }
 
-/** Incoming call that was explicitly ended on our side before picking up or outgoing call that was declined before the timeout. */
+/* Incoming call that was explicitly ended on our side before picking up or outgoing call that was declined before the timeout. */
   public static class Declined extends CallState {
   }
 

src/main/java/chat/delta/rpc/types/ChatListItemFetchResult.java

@@ -16,7 +16,7 @@ public abstract class ChatListItemFetchResult {
     public String avatarPath;
     public ChatType chatType;
     public String color;
-    /** contact id if this is a dm chat (for view profile entry in context menu) */
+    /* contact id if this is a dm chat (for view profile entry in context menu) */
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public Integer dmChatContact;
     public Integer freshMessageCounter;
@@ -36,7 +36,7 @@ public abstract class ChatListItemFetchResult {
      * See also `is_key_contact` on `Contact`.
      */
     public Boolean isEncrypted;
-    /** deprecated 2025-07, use chat_type instead */
+    /* deprecated 2025-07, use chat_type instead */
     public Boolean isGroup;
     public Boolean isMuted;
     public Boolean isPinned;
@@ -50,7 +50,7 @@ public abstract class ChatListItemFetchResult {
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public Integer lastUpdated;
     public String name;
-    /** showing preview if last chat message is image */
+    /* showing preview if last chat message is image */
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public String summaryPreviewImage;
     public Integer summaryStatus;

src/main/java/chat/delta/rpc/types/Contact.java

@@ -14,9 +14,9 @@ public class Contact {
   public Boolean e2eeAvail;
   public Integer id;
   public Boolean isBlocked;
-  /** If the contact is a bot. */
+  /* If the contact is a bot. */
   public Boolean isBot;
-  /** Is the contact a key contact. */
+  /* Is the contact a key contact. */
   public Boolean isKeyContact;
   /**
    * True if the contact can be added to protected chats because SELF and contact have verified their fingerprints in both directions.
@@ -24,7 +24,7 @@ public class Contact {
    * See [`Self::verifier_id`]/`Contact.verifierId` for a guidance how to display these information.
    */
   public Boolean isVerified;
-  /** the contact's last seen timestamp */
+  /* the contact's last seen timestamp */
   public Integer lastSeen;
   public String name;
   public String nameAndAddr;
@@ -38,7 +38,7 @@ public class Contact {
    * <p>
    * UI should display the information in the contact's profile as follows:
    * <p>
-   * - If `verifierId` != 0, display text "Introduced by ..." with the name of the contact. Prefix the text by a green checkmark.
+   * - If `verifierId` != 0, display text "Introduced by ..." with the name and address of the contact formatted by `name_and_addr`/`nameAndAddr`. Prefix the text by a green checkmark.
    * <p>
    * - If `verifierId` == 0 and `isVerified` != 0, display "Introduced" prefixed by a green checkmark.
    * <p>

src/main/java/chat/delta/rpc/types/EnteredCertificateChecks.java

@@ -2,12 +2,12 @@
 package chat.delta.rpc.types;
 
 public enum EnteredCertificateChecks {
-  /** `Automatic` means that provider database setting should be taken. If there is no provider database setting for certificate checks, check certificates strictly. */
+  /* `Automatic` means that provider database setting should be taken. If there is no provider database setting for certificate checks, check certificates strictly. */
   automatic,
 
-  /** Ensure that TLS certificate is valid for the server hostname. */
+  /* Ensure that TLS certificate is valid for the server hostname. */
   strict,
 
-  /** Accept certificates that are expired, self-signed or otherwise not valid for the server hostname. */
+  /* Accept certificates that are expired, self-signed or otherwise not valid for the server hostname. */
   acceptInvalidCertificates,
 }

src/main/java/chat/delta/rpc/types/EnteredLoginParam.java

@@ -7,27 +7,27 @@ package chat.delta.rpc.types;
  * Usually it will be enough to only set `addr` and `password`, and all the other settings will be autoconfigured.
  */
 public class EnteredLoginParam {
-  /** Email address. */
+  /* Email address. */
   public String addr;
-  /** TLS options: whether to allow invalid certificates and/or invalid hostnames. Default: Automatic */
+  /* TLS options: whether to allow invalid certificates and/or invalid hostnames. Default: Automatic */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public EnteredCertificateChecks certificateChecks;
-  /** Imap server port. */
+  /* Imap server port. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public Integer imapPort;
-  /** Imap socket security. */
+  /* Imap socket security. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public Socket imapSecurity;
-  /** Imap server hostname or IP address. */
+  /* Imap server hostname or IP address. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String imapServer;
-  /** Imap username. */
+  /* Imap username. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String imapUser;
-  /** If true, login via OAUTH2 (not recommended anymore). Default: false */
+  /* If true, login via OAUTH2 (not recommended anymore). Default: false */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public Boolean oauth2;
-  /** Password. */
+  /* Password. */
   public String password;
   /**
    * SMTP Password.
@@ -36,16 +36,16 @@ public class EnteredLoginParam {
    */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String smtpPassword;
-  /** SMTP server port. */
+  /* SMTP server port. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public Integer smtpPort;
-  /** SMTP socket security. */
+  /* SMTP socket security. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public Socket smtpSecurity;
-  /** SMTP server hostname or IP address. */
+  /* SMTP server hostname or IP address. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String smtpServer;
-  /** SMTP username. */
+  /* SMTP username. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String smtpUser;
 }

src/main/java/chat/delta/rpc/types/EphemeralTimer.java

@@ -11,11 +11,11 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 @JsonSubTypes({@Type(value = EphemeralTimer.Disabled.class, name="Disabled"), @Type(value = EphemeralTimer.Enabled.class, name="Enabled")})
 public abstract class EphemeralTimer {
 
-/** Timer is disabled. */
+/* Timer is disabled. */
   public static class Disabled extends EphemeralTimer {
   }
 
-/** Timer is enabled. */
+/* Timer is enabled. */
   public static class Enabled extends EphemeralTimer {
     /**
      * Timer duration in seconds.

src/main/java/chat/delta/rpc/types/Event.java

@@ -2,8 +2,8 @@
 package chat.delta.rpc.types;
 
 public class Event {
-  /** Account ID. */
+  /* Account ID. */
   public Integer contextId;
-  /** Event payload. */
+  /* Event payload. */
   public EventType event;
 }

src/main/java/chat/delta/rpc/types/EventType.java

@@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 
 @JsonTypeInfo(use=Id.NAME, include=As.PROPERTY, property="kind")
-@JsonSubTypes({@Type(value = EventType.Info.class, name="Info"), @Type(value = EventType.SmtpConnected.class, name="SmtpConnected"), @Type(value = EventType.ImapConnected.class, name="ImapConnected"), @Type(value = EventType.SmtpMessageSent.class, name="SmtpMessageSent"), @Type(value = EventType.ImapMessageDeleted.class, name="ImapMessageDeleted"), @Type(value = EventType.ImapMessageMoved.class, name="ImapMessageMoved"), @Type(value = EventType.ImapInboxIdle.class, name="ImapInboxIdle"), @Type(value = EventType.NewBlobFile.class, name="NewBlobFile"), @Type(value = EventType.DeletedBlobFile.class, name="DeletedBlobFile"), @Type(value = EventType.Warning.class, name="Warning"), @Type(value = EventType.Error.class, name="Error"), @Type(value = EventType.ErrorSelfNotInGroup.class, name="ErrorSelfNotInGroup"), @Type(value = EventType.MsgsChanged.class, name="MsgsChanged"), @Type(value = EventType.ReactionsChanged.class, name="ReactionsChanged"), @Type(value = EventType.IncomingReaction.class, name="IncomingReaction"), @Type(value = EventType.IncomingWebxdcNotify.class, name="IncomingWebxdcNotify"), @Type(value = EventType.IncomingMsg.class, name="IncomingMsg"), @Type(value = EventType.IncomingMsgBunch.class, name="IncomingMsgBunch"), @Type(value = EventType.MsgsNoticed.class, name="MsgsNoticed"), @Type(value = EventType.MsgDelivered.class, name="MsgDelivered"), @Type(value = EventType.MsgFailed.class, name="MsgFailed"), @Type(value = EventType.MsgRead.class, name="MsgRead"), @Type(value = EventType.MsgDeleted.class, name="MsgDeleted"), @Type(value = EventType.ChatModified.class, name="ChatModified"), @Type(value = EventType.ChatEphemeralTimerModified.class, name="ChatEphemeralTimerModified"), @Type(value = EventType.ChatDeleted.class, name="ChatDeleted"), @Type(value = EventType.ContactsChanged.class, name="ContactsChanged"), @Type(value = EventType.LocationChanged.class, name="LocationChanged"), @Type(value = EventType.ConfigureProgress.class, name="ConfigureProgress"), @Type(value = EventType.ImexProgress.class, name="ImexProgress"), @Type(value = EventType.ImexFileWritten.class, name="ImexFileWritten"), @Type(value = EventType.SecurejoinInviterProgress.class, name="SecurejoinInviterProgress"), @Type(value = EventType.SecurejoinJoinerProgress.class, name="SecurejoinJoinerProgress"), @Type(value = EventType.ConnectivityChanged.class, name="ConnectivityChanged"), @Type(value = EventType.SelfavatarChanged.class, name="SelfavatarChanged"), @Type(value = EventType.ConfigSynced.class, name="ConfigSynced"), @Type(value = EventType.WebxdcStatusUpdate.class, name="WebxdcStatusUpdate"), @Type(value = EventType.WebxdcRealtimeData.class, name="WebxdcRealtimeData"), @Type(value = EventType.WebxdcRealtimeAdvertisementReceived.class, name="WebxdcRealtimeAdvertisementReceived"), @Type(value = EventType.WebxdcInstanceDeleted.class, name="WebxdcInstanceDeleted"), @Type(value = EventType.AccountsBackgroundFetchDone.class, name="AccountsBackgroundFetchDone"), @Type(value = EventType.ChatlistChanged.class, name="ChatlistChanged"), @Type(value = EventType.ChatlistItemChanged.class, name="ChatlistItemChanged"), @Type(value = EventType.AccountsChanged.class, name="AccountsChanged"), @Type(value = EventType.AccountsItemChanged.class, name="AccountsItemChanged"), @Type(value = EventType.EventChannelOverflow.class, name="EventChannelOverflow"), @Type(value = EventType.IncomingCall.class, name="IncomingCall"), @Type(value = EventType.IncomingCallAccepted.class, name="IncomingCallAccepted"), @Type(value = EventType.OutgoingCallAccepted.class, name="OutgoingCallAccepted"), @Type(value = EventType.CallEnded.class, name="CallEnded"), @Type(value = EventType.TransportsModified.class, name="TransportsModified")})
+@JsonSubTypes({@Type(value = EventType.Info.class, name="Info"), @Type(value = EventType.SmtpConnected.class, name="SmtpConnected"), @Type(value = EventType.ImapConnected.class, name="ImapConnected"), @Type(value = EventType.SmtpMessageSent.class, name="SmtpMessageSent"), @Type(value = EventType.ImapMessageDeleted.class, name="ImapMessageDeleted"), @Type(value = EventType.ImapMessageMoved.class, name="ImapMessageMoved"), @Type(value = EventType.ImapInboxIdle.class, name="ImapInboxIdle"), @Type(value = EventType.NewBlobFile.class, name="NewBlobFile"), @Type(value = EventType.DeletedBlobFile.class, name="DeletedBlobFile"), @Type(value = EventType.Warning.class, name="Warning"), @Type(value = EventType.Error.class, name="Error"), @Type(value = EventType.ErrorSelfNotInGroup.class, name="ErrorSelfNotInGroup"), @Type(value = EventType.MsgsChanged.class, name="MsgsChanged"), @Type(value = EventType.ReactionsChanged.class, name="ReactionsChanged"), @Type(value = EventType.IncomingReaction.class, name="IncomingReaction"), @Type(value = EventType.IncomingWebxdcNotify.class, name="IncomingWebxdcNotify"), @Type(value = EventType.IncomingMsg.class, name="IncomingMsg"), @Type(value = EventType.IncomingMsgBunch.class, name="IncomingMsgBunch"), @Type(value = EventType.MsgsNoticed.class, name="MsgsNoticed"), @Type(value = EventType.MsgDelivered.class, name="MsgDelivered"), @Type(value = EventType.MsgFailed.class, name="MsgFailed"), @Type(value = EventType.MsgRead.class, name="MsgRead"), @Type(value = EventType.MsgDeleted.class, name="MsgDeleted"), @Type(value = EventType.ChatModified.class, name="ChatModified"), @Type(value = EventType.ChatEphemeralTimerModified.class, name="ChatEphemeralTimerModified"), @Type(value = EventType.ChatDeleted.class, name="ChatDeleted"), @Type(value = EventType.ContactsChanged.class, name="ContactsChanged"), @Type(value = EventType.LocationChanged.class, name="LocationChanged"), @Type(value = EventType.ConfigureProgress.class, name="ConfigureProgress"), @Type(value = EventType.ImexProgress.class, name="ImexProgress"), @Type(value = EventType.ImexFileWritten.class, name="ImexFileWritten"), @Type(value = EventType.SecurejoinInviterProgress.class, name="SecurejoinInviterProgress"), @Type(value = EventType.SecurejoinJoinerProgress.class, name="SecurejoinJoinerProgress"), @Type(value = EventType.ConnectivityChanged.class, name="ConnectivityChanged"), @Type(value = EventType.SelfavatarChanged.class, name="SelfavatarChanged"), @Type(value = EventType.ConfigSynced.class, name="ConfigSynced"), @Type(value = EventType.WebxdcStatusUpdate.class, name="WebxdcStatusUpdate"), @Type(value = EventType.WebxdcRealtimeData.class, name="WebxdcRealtimeData"), @Type(value = EventType.WebxdcRealtimeAdvertisementReceived.class, name="WebxdcRealtimeAdvertisementReceived"), @Type(value = EventType.WebxdcInstanceDeleted.class, name="WebxdcInstanceDeleted"), @Type(value = EventType.AccountsBackgroundFetchDone.class, name="AccountsBackgroundFetchDone"), @Type(value = EventType.ChatlistChanged.class, name="ChatlistChanged"), @Type(value = EventType.ChatlistItemChanged.class, name="ChatlistItemChanged"), @Type(value = EventType.AccountsChanged.class, name="AccountsChanged"), @Type(value = EventType.AccountsItemChanged.class, name="AccountsItemChanged"), @Type(value = EventType.EventChannelOverflow.class, name="EventChannelOverflow"), @Type(value = EventType.IncomingCall.class, name="IncomingCall"), @Type(value = EventType.IncomingCallAccepted.class, name="IncomingCallAccepted"), @Type(value = EventType.OutgoingCallAccepted.class, name="OutgoingCallAccepted"), @Type(value = EventType.CallEnded.class, name="CallEnded")})
 public abstract class EventType {
 
 /**
@@ -20,41 +20,41 @@ public abstract class EventType {
     public String msg;
   }
 
-/** Emitted when SMTP connection is established and login was successful. */
+/* Emitted when SMTP connection is established and login was successful. */
   public static class SmtpConnected extends EventType {
     public String msg;
   }
 
-/** Emitted when IMAP connection is established and login was successful. */
+/* Emitted when IMAP connection is established and login was successful. */
   public static class ImapConnected extends EventType {
     public String msg;
   }
 
-/** Emitted when a message was successfully sent to the SMTP server. */
+/* Emitted when a message was successfully sent to the SMTP server. */
   public static class SmtpMessageSent extends EventType {
     public String msg;
   }
 
-/** Emitted when an IMAP message has been marked as deleted */
+/* Emitted when an IMAP message has been marked as deleted */
   public static class ImapMessageDeleted extends EventType {
     public String msg;
   }
 
-/** Emitted when an IMAP message has been moved */
+/* Emitted when an IMAP message has been moved */
   public static class ImapMessageMoved extends EventType {
     public String msg;
   }
 
-/** Emitted before going into IDLE on the Inbox folder. */
+/* Emitted before going into IDLE on the Inbox folder. */
   public static class ImapInboxIdle extends EventType {
   }
 
-/** Emitted when an new file in the $BLOBDIR was created */
+/* Emitted when an new file in the $BLOBDIR was created */
   public static class NewBlobFile extends EventType {
     public String file;
   }
 
-/** Emitted when an file in the $BLOBDIR was deleted */
+/* Emitted when an file in the $BLOBDIR was deleted */
   public static class DeletedBlobFile extends EventType {
     public String file;
   }
@@ -79,26 +79,26 @@ public abstract class EventType {
     public String msg;
   }
 
-/** An action cannot be performed because the user is not in the group. Reported eg. after a call to setChatName(), setChatProfileImage(), addContactToChat(), removeContactFromChat(), and messages sending functions. */
+/* An action cannot be performed because the user is not in the group. Reported eg. after a call to setChatName(), setChatProfileImage(), addContactToChat(), removeContactFromChat(), and messages sending functions. */
   public static class ErrorSelfNotInGroup extends EventType {
     public String msg;
   }
 
-/** Messages or chats changed.  One or more messages or chats changed for various reasons in the database: - Messages sent, received or removed - Chats created, deleted or archived - A draft has been set */
+/* Messages or chats changed.  One or more messages or chats changed for various reasons in the database: - Messages sent, received or removed - Chats created, deleted or archived - A draft has been set */
   public static class MsgsChanged extends EventType {
-    /** Set if only a single chat is affected by the changes, otherwise 0. */
+    /* Set if only a single chat is affected by the changes, otherwise 0. */
     public Integer chatId;
-    /** Set if only a single message is affected by the changes, otherwise 0. */
+    /* Set if only a single message is affected by the changes, otherwise 0. */
     public Integer msgId;
   }
 
-/** Reactions for the message changed. */
+/* Reactions for the message changed. */
   public static class ReactionsChanged extends EventType {
-    /** ID of the chat which the message belongs to. */
+    /* ID of the chat which the message belongs to. */
     public Integer chatId;
-    /** ID of the contact whose reaction set is changed. */
+    /* ID of the contact whose reaction set is changed. */
     public Integer contactId;
-    /** ID of the message for which reactions were changed. */
+    /* ID of the message for which reactions were changed. */
     public Integer msgId;
   }
 
@@ -108,28 +108,28 @@ public abstract class EventType {
  * In addition to this event, ReactionsChanged is emitted.
  */
   public static class IncomingReaction extends EventType {
-    /** ID of the chat which the message belongs to. */
+    /* ID of the chat which the message belongs to. */
     public Integer chatId;
-    /** ID of the contact whose reaction set is changed. */
+    /* ID of the contact whose reaction set is changed. */
     public Integer contactId;
-    /** ID of the message for which reactions were changed. */
+    /* ID of the message for which reactions were changed. */
     public Integer msgId;
-    /** The reaction. */
+    /* The reaction. */
     public String reaction;
   }
 
-/** Incoming webxdc info or summary update, should be notified. */
+/* Incoming webxdc info or summary update, should be notified. */
   public static class IncomingWebxdcNotify extends EventType {
-    /** ID of the chat. */
+    /* ID of the chat. */
     public Integer chatId;
-    /** ID of the contact sending. */
+    /* ID of the contact sending. */
     public Integer contactId;
-    /** Link assigned to this notification, if any. */
+    /* Link assigned to this notification, if any. */
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public String href;
-    /** ID of the added info message or webxdc instance in case of summary change. */
+    /* ID of the added info message or webxdc instance in case of summary change. */
     public Integer msgId;
-    /** Text to notify. */
+    /* Text to notify. */
     public String text;
   }
 
@@ -139,42 +139,42 @@ public abstract class EventType {
  * There is no extra #DC_EVENT_MSGS_CHANGED event sent together with this event.
  */
   public static class IncomingMsg extends EventType {
-    /** ID of the chat where the message is assigned. */
+    /* ID of the chat where the message is assigned. */
     public Integer chatId;
-    /** ID of the message. */
+    /* ID of the message. */
     public Integer msgId;
   }
 
-/** Downloading a bunch of messages just finished. This is an event to allow the UI to only show one notification per message bunch, instead of cluttering the user with many notifications. */
+/* Downloading a bunch of messages just finished. This is an event to allow the UI to only show one notification per message bunch, instead of cluttering the user with many notifications. */
   public static class IncomingMsgBunch extends EventType {
   }
 
-/** Messages were seen or noticed. chat id is always set. */
+/* Messages were seen or noticed. chat id is always set. */
   public static class MsgsNoticed extends EventType {
     public Integer chatId;
   }
 
-/** A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to DC_STATE_OUT_DELIVERED, see `Message.state`. */
+/* A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to DC_STATE_OUT_DELIVERED, see `Message.state`. */
   public static class MsgDelivered extends EventType {
-    /** ID of the chat which the message belongs to. */
+    /* ID of the chat which the message belongs to. */
     public Integer chatId;
-    /** ID of the message that was successfully sent. */
+    /* ID of the message that was successfully sent. */
     public Integer msgId;
   }
 
-/** A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to DC_STATE_OUT_FAILED, see `Message.state`. */
+/* A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to DC_STATE_OUT_FAILED, see `Message.state`. */
   public static class MsgFailed extends EventType {
-    /** ID of the chat which the message belongs to. */
+    /* ID of the chat which the message belongs to. */
     public Integer chatId;
-    /** ID of the message that could not be sent. */
+    /* ID of the message that could not be sent. */
     public Integer msgId;
   }
 
-/** A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to DC_STATE_OUT_MDN_RCVD, see `Message.state`. */
+/* A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to DC_STATE_OUT_MDN_RCVD, see `Message.state`. */
   public static class MsgRead extends EventType {
-    /** ID of the chat which the message belongs to. */
+    /* ID of the chat which the message belongs to. */
     public Integer chatId;
-    /** ID of the message that was read. */
+    /* ID of the message that was read. */
     public Integer msgId;
   }
 
@@ -188,9 +188,9 @@ public abstract class EventType {
  * This event does not indicate the message deletion from the server.
  */
   public static class MsgDeleted extends EventType {
-    /** ID of the chat where the message was prior to deletion. Never 0. */
+    /* ID of the chat where the message was prior to deletion. Never 0. */
     public Integer chatId;
-    /** ID of the deleted message. Never 0. */
+    /* ID of the deleted message. Never 0. */
     public Integer msgId;
   }
 
@@ -203,37 +203,37 @@ public abstract class EventType {
     public Integer chatId;
   }
 
-/** Chat ephemeral timer changed. */
+/* Chat ephemeral timer changed. */
   public static class ChatEphemeralTimerModified extends EventType {
-    /** Chat ID. */
+    /* Chat ID. */
     public Integer chatId;
-    /** New ephemeral timer value. */
+    /* New ephemeral timer value. */
     public Integer timer;
   }
 
-/** Chat deleted. */
+/* Chat deleted. */
   public static class ChatDeleted extends EventType {
-    /** Chat ID. */
+    /* Chat ID. */
     public Integer chat_id;
   }
 
-/** Contact(s) created, renamed, blocked or deleted. */
+/* Contact(s) created, renamed, blocked or deleted. */
   public static class ContactsChanged extends EventType {
-    /** If set, this is the contact_id of an added contact that should be selected. */
+    /* If set, this is the contact_id of an added contact that should be selected. */
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public Integer contactId;
   }
 
-/** Location of one or more contact has changed. */
+/* Location of one or more contact has changed. */
   public static class LocationChanged extends EventType {
-    /** contact_id of the contact for which the location has changed. If the locations of several contacts have been changed, this parameter is set to `None`. */
+    /* contact_id of the contact for which the location has changed. If the locations of several contacts have been changed, this parameter is set to `None`. */
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public Integer contactId;
   }
 
-/** Inform about the configuration progress started by configure(). */
+/* Inform about the configuration progress started by configure(). */
   public static class ConfigureProgress extends EventType {
-    /** Progress comment or error, something to display to the user. */
+    /* Progress comment or error, something to display to the user. */
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public String comment;
     /**
@@ -244,9 +244,9 @@ public abstract class EventType {
     public Integer progress;
   }
 
-/** Inform about the import/export progress started by imex(). */
+/* Inform about the import/export progress started by imex(). */
   public static class ImexProgress extends EventType {
-    /** 0=error, 1-999=progress in permille, 1000=success and done */
+    /* 0=error, 1-999=progress in permille, 1000=success and done */
     public Integer progress;
   }
 
@@ -267,62 +267,62 @@ public abstract class EventType {
  * These events are typically sent after a joiner has scanned the QR code generated by getChatSecurejoinQrCodeSvg().
  */
   public static class SecurejoinInviterProgress extends EventType {
-    /** ID of the chat in case of success. */
+    /* ID of the chat in case of success. */
     public Integer chatId;
-    /** The type of the joined chat. This can take the same values as `BasicChat.chatType` ([`crate::api::types::chat::BasicChat::chat_type`]). */
+    /* The type of the joined chat. This can take the same values as `BasicChat.chatType` ([`crate::api::types::chat::BasicChat::chat_type`]). */
     public ChatType chatType;
-    /** ID of the contact that wants to join. */
+    /* ID of the contact that wants to join. */
     public Integer contactId;
-    /** Progress, always 1000. */
+    /* Progress, always 1000. */
     public Integer progress;
   }
 
-/** Progress information of a secure-join handshake from the view of the joiner (Bob, the person who scans the QR code). The events are typically sent while secureJoin(), which may take some time, is executed. */
+/* Progress information of a secure-join handshake from the view of the joiner (Bob, the person who scans the QR code). The events are typically sent while secureJoin(), which may take some time, is executed. */
   public static class SecurejoinJoinerProgress extends EventType {
-    /** ID of the inviting contact. */
+    /* ID of the inviting contact. */
     public Integer contactId;
-    /** Progress as: 400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself." (Bob has verified alice and waits until Alice does the same for him) 1000=vg-member-added/vc-contact-confirm received */
+    /* Progress as: 400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself." (Bob has verified alice and waits until Alice does the same for him) 1000=vg-member-added/vc-contact-confirm received */
     public Integer progress;
   }
 
-/** The connectivity to the server changed. This means that you should refresh the connectivity view and possibly the connectivtiy HTML; see getConnectivity() and getConnectivityHtml() for details. */
+/* The connectivity to the server changed. This means that you should refresh the connectivity view and possibly the connectivtiy HTML; see getConnectivity() and getConnectivityHtml() for details. */
   public static class ConnectivityChanged extends EventType {
   }
 
-/** Deprecated by `ConfigSynced`. */
+/* Deprecated by `ConfigSynced`. */
   public static class SelfavatarChanged extends EventType {
   }
 
-/** A multi-device synced config value changed. Maybe the app needs to refresh smth. For uniformity this is emitted on the source device too. The value isn't here, otherwise it would be logged which might not be good for privacy. */
+/* A multi-device synced config value changed. Maybe the app needs to refresh smth. For uniformity this is emitted on the source device too. The value isn't here, otherwise it would be logged which might not be good for privacy. */
   public static class ConfigSynced extends EventType {
-    /** Configuration key. */
+    /* Configuration key. */
     public String key;
   }
 
   public static class WebxdcStatusUpdate extends EventType {
-    /** Message ID. */
+    /* Message ID. */
     public Integer msgId;
-    /** Status update ID. */
+    /* Status update ID. */
     public Integer statusUpdateSerial;
   }
 
-/** Data received over an ephemeral peer channel. */
+/* Data received over an ephemeral peer channel. */
   public static class WebxdcRealtimeData extends EventType {
-    /** Realtime data. */
+    /* Realtime data. */
     public java.util.List<Integer> data;
-    /** Message ID. */
+    /* Message ID. */
     public Integer msgId;
   }
 
-/** Advertisement received over an ephemeral peer channel. This can be used by bots to initiate peer-to-peer communication from their side. */
+/* Advertisement received over an ephemeral peer channel. This can be used by bots to initiate peer-to-peer communication from their side. */
   public static class WebxdcRealtimeAdvertisementReceived extends EventType {
-    /** Message ID of the webxdc instance. */
+    /* Message ID of the webxdc instance. */
     public Integer msgId;
   }
 
-/** Inform that a message containing a webxdc instance has been deleted */
+/* Inform that a message containing a webxdc instance has been deleted */
   public static class WebxdcInstanceDeleted extends EventType {
-    /** ID of the deleted message. */
+    /* ID of the deleted message. */
     public Integer msgId;
   }
 
@@ -342,9 +342,9 @@ public abstract class EventType {
   public static class ChatlistChanged extends EventType {
   }
 
-/** Inform that a single chat list item changed and needs to be rerendered. If `chat_id` is set to None, then all currently visible chats need to be rerendered, and all not-visible items need to be cleared from cache if the UI has a cache. */
+/* Inform that a single chat list item changed and needs to be rerendered. If `chat_id` is set to None, then all currently visible chats need to be rerendered, and all not-visible items need to be cleared from cache if the UI has a cache. */
   public static class ChatlistItemChanged extends EventType {
-    /** ID of the changed chat */
+    /* ID of the changed chat */
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public Integer chatId;
   }
@@ -365,58 +365,48 @@ public abstract class EventType {
   public static class AccountsItemChanged extends EventType {
   }
 
-/** Inform than some events have been skipped due to event channel overflow. */
+/* Inform than some events have been skipped due to event channel overflow. */
   public static class EventChannelOverflow extends EventType {
-    /** Number of events skipped. */
+    /* Number of events skipped. */
     public Integer n;
   }
 
-/** Incoming call. */
+/* Incoming call. */
   public static class IncomingCall extends EventType {
-    /** ID of the chat which the message belongs to. */
+    /* ID of the chat which the message belongs to. */
     public Integer chat_id;
-    /** True if incoming call is a video call. */
+    /* True if incoming call is a video call. */
     public Boolean has_video;
-    /** ID of the info message referring to the call. */
+    /* ID of the info message referring to the call. */
     public Integer msg_id;
-    /** User-defined info as passed to place_outgoing_call() */
+    /* User-defined info as passed to place_outgoing_call() */
     public String place_call_info;
   }
 
-/** Incoming call accepted. This is esp. interesting to stop ringing on other devices. */
+/* Incoming call accepted. This is esp. interesting to stop ringing on other devices. */
   public static class IncomingCallAccepted extends EventType {
-    /** ID of the chat which the message belongs to. */
+    /* ID of the chat which the message belongs to. */
     public Integer chat_id;
-    /** ID of the info message referring to the call. */
+    /* ID of the info message referring to the call. */
     public Integer msg_id;
   }
 
-/** Outgoing call accepted. */
+/* Outgoing call accepted. */
   public static class OutgoingCallAccepted extends EventType {
-    /** User-defined info passed to dc_accept_incoming_call( */
+    /* User-defined info passed to dc_accept_incoming_call( */
     public String accept_call_info;
-    /** ID of the chat which the message belongs to. */
+    /* ID of the chat which the message belongs to. */
     public Integer chat_id;
-    /** ID of the info message referring to the call. */
+    /* ID of the info message referring to the call. */
     public Integer msg_id;
   }
 
-/** Call ended. */
+/* Call ended. */
   public static class CallEnded extends EventType {
-    /** ID of the chat which the message belongs to. */
+    /* ID of the chat which the message belongs to. */
     public Integer chat_id;
-    /** ID of the info message referring to the call. */
+    /* ID of the info message referring to the call. */
     public Integer msg_id;
   }
 
-/**
- * One or more transports has changed.
- * <p>
- * UI should update the list.
- * <p>
- * This event is emitted when transport synchronization messages arrives, but not when the UI modifies the transport list by itself.
- */
-  public static class TransportsModified extends EventType {
-  }
-
 }

src/main/java/chat/delta/rpc/types/FullChat.java

@@ -7,6 +7,7 @@ public class FullChat {
   public ChatType chatType;
   public String color;
   public java.util.List<Integer> contactIds;
+  public java.util.List<Contact> contacts;
   public Integer ephemeralTimer;
   public Integer freshMessageCounter;
   public Integer id;
@@ -30,12 +31,12 @@ public class FullChat {
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String mailingListAddress;
   public String name;
-  /** Contact IDs of the past chat members. */
+  /* Contact IDs of the past chat members. */
   public java.util.List<Integer> pastContactIds;
   public Boolean pinned;
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String profileImage;
-  /** Note that this is different from [`ChatListItem::is_self_in_group`](`crate::api::types::chat_list::ChatListItemFetchResult::ChatListItem::is_self_in_group`). This property should only be accessed when [`FullChat::chat_type`] is [`Chattype::Group`]. */
+  /* Note that this is different from [`ChatListItem::is_self_in_group`](`crate::api::types::chat_list::ChatListItemFetchResult::ChatListItem::is_self_in_group`). This property should only be accessed when [`FullChat::chat_type`] is [`Chattype::Group`]. */
   public Boolean selfInGroup;
   public Boolean wasSeenRecently;
 }

src/main/java/chat/delta/rpc/types/HttpResponse.java

@@ -2,12 +2,12 @@
 package chat.delta.rpc.types;
 
 public class HttpResponse {
-  /** base64-encoded response body. */
+  /* base64-encoded response body. */
   public String blob;
-  /** Encoding, e.g. "utf-8". */
+  /* Encoding, e.g. "utf-8". */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String encoding;
-  /** MIME type, e.g. "text/plain" or "text/html". */
+  /* MIME type, e.g. "text/plain" or "text/html". */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String mimetype;
 }

src/main/java/chat/delta/rpc/types/Message.java

@@ -7,12 +7,11 @@ public class Message {
   public Integer dimensionsWidth;
   public DownloadState downloadState;
   public Integer duration;
-  /** An error text, if there is one. */
+  /* An error text, if there is one. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String error;
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String file;
-  /** The size of the file in bytes, if applicable. If message is a pre-message, then this is the size of the file to be downloaded. */
   public Integer fileBytes;
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String fileMime;
@@ -21,13 +20,13 @@ public class Message {
   public Integer fromId;
   public Boolean hasDeviatingTimestamp;
   public Boolean hasHtml;
-  /** Check if a message has a POI location bound to it. These locations are also returned by `get_locations` method. The UI may decide to display a special icon beside such messages. */
+  /* Check if a message has a POI location bound to it. These locations are also returned by `get_locations` method. The UI may decide to display a special icon beside such messages. */
   public Boolean hasLocation;
   public Integer id;
-  /** if is_info is set, this refers to the contact profile that should be opened when the info message is tapped. */
+  /* if is_info is set, this refers to the contact profile that should be opened when the info message is tapped. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public Integer infoContactId;
-  /** True if the message was sent by a bot. */
+  /* True if the message was sent by a bot. */
   public Boolean isBot;
   public Boolean isEdited;
   public Boolean isForwarded;
@@ -58,7 +57,7 @@ public class Message {
   public Integer sortTimestamp;
   public Integer state;
   public String subject;
-  /** when is_info is true this describes what type of system message it is */
+  /* when is_info is true this describes what type of system message it is */
   public SystemMessageType systemMessageType;
   public String text;
   public Integer timestamp;

src/main/java/chat/delta/rpc/types/MessageData.java

@@ -12,7 +12,7 @@ public class MessageData {
   public Pair<Float, Float> location;
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String overrideSenderName;
-  /** Quoted message id. Takes preference over `quoted_text` (see below). */
+  /* Quoted message id. Takes preference over `quoted_text` (see below). */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public Integer quotedMessageId;
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)

src/main/java/chat/delta/rpc/types/MessageInfo.java

@@ -3,7 +3,7 @@ package chat.delta.rpc.types;
 
 public class MessageInfo {
   public EphemeralTimer ephemeralTimer;
-  /** When message is ephemeral this contains the timestamp of the message expiry */
+  /* When message is ephemeral this contains the timestamp of the message expiry */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public Integer ephemeralTimestamp;
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)

src/main/java/chat/delta/rpc/types/MessageListItem.java

@@ -15,9 +15,9 @@ public abstract class MessageListItem {
     public Integer msg_id;
   }
 
-/** Day marker, separating messages that correspond to different days according to local time. */
+/* Day marker, separating messages that correspond to different days according to local time. */
   public static class DayMarker extends MessageListItem {
-    /** Marker timestamp, for day markers, in unix milliseconds */
+    /* Marker timestamp, for day markers, in unix milliseconds */
     public Integer timestamp;
   }
 

src/main/java/chat/delta/rpc/types/MessageLoadResult.java

@@ -17,12 +17,11 @@ public abstract class MessageLoadResult {
     public Integer dimensionsWidth;
     public DownloadState downloadState;
     public Integer duration;
-    /** An error text, if there is one. */
+    /* An error text, if there is one. */
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public String error;
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public String file;
-    /** The size of the file in bytes, if applicable. If message is a pre-message, then this is the size of the file to be downloaded. */
     public Integer fileBytes;
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public String fileMime;
@@ -31,13 +30,13 @@ public abstract class MessageLoadResult {
     public Integer fromId;
     public Boolean hasDeviatingTimestamp;
     public Boolean hasHtml;
-    /** Check if a message has a POI location bound to it. These locations are also returned by `get_locations` method. The UI may decide to display a special icon beside such messages. */
+    /* Check if a message has a POI location bound to it. These locations are also returned by `get_locations` method. The UI may decide to display a special icon beside such messages. */
     public Boolean hasLocation;
     public Integer id;
-    /** if is_info is set, this refers to the contact profile that should be opened when the info message is tapped. */
+    /* if is_info is set, this refers to the contact profile that should be opened when the info message is tapped. */
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public Integer infoContactId;
-    /** True if the message was sent by a bot. */
+    /* True if the message was sent by a bot. */
     public Boolean isBot;
     public Boolean isEdited;
     public Boolean isForwarded;
@@ -68,7 +67,7 @@ public abstract class MessageLoadResult {
     public Integer sortTimestamp;
     public Integer state;
     public String subject;
-    /** when is_info is true this describes what type of system message it is */
+    /* when is_info is true this describes what type of system message it is */
     public SystemMessageType systemMessageType;
     public String text;
     public Integer timestamp;

src/main/java/chat/delta/rpc/types/MessageNotificationInfo.java

@@ -12,9 +12,9 @@ public class MessageNotificationInfo {
   public String image;
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String imageMimeType;
-  /** also known as summary_text1 */
+  /* also known as summary_text1 */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String summaryPrefix;
-  /** also known as summary_text2 */
+  /* also known as summary_text2 */
   public String summaryText;
 }

src/main/java/chat/delta/rpc/types/MessageQuote.java

@@ -18,7 +18,7 @@ public abstract class MessageQuote {
   public static class WithMessage extends MessageQuote {
     public String authorDisplayColor;
     public String authorDisplayName;
-    /** The quoted message does not always belong to the same chat, e.g. when "Reply Privately" is used. */
+    /* The quoted message does not always belong to the same chat, e.g. when "Reply Privately" is used. */
     public Integer chatId;
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public String image;

src/main/java/chat/delta/rpc/types/MessageSearchResult.java

@@ -4,7 +4,7 @@ package chat.delta.rpc.types;
 public class MessageSearchResult {
   public String authorColor;
   public Integer authorId;
-  /** if sender name if overridden it will show it as ~alias */
+  /* if sender name if overridden it will show it as ~alias */
   public String authorName;
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String authorProfileImage;

src/main/java/chat/delta/rpc/types/NotifyState.java

@@ -2,12 +2,12 @@
 package chat.delta.rpc.types;
 
 public enum NotifyState {
-  /** Not subscribed to push notifications. */
+  /* Not subscribed to push notifications. */
   NotConnected,
 
-  /** Subscribed to heartbeat push notifications. */
+  /* Subscribed to heartbeat push notifications. */
   Heartbeat,
 
-  /** Subscribed to push notifications for new messages. */
+  /* Subscribed to push notifications for new messages. */
   Connected,
 }

src/main/java/chat/delta/rpc/types/ProviderInfo.java

@@ -3,7 +3,7 @@ package chat.delta.rpc.types;
 
 public class ProviderInfo {
   public String beforeLoginHint;
-  /** Unique ID, corresponding to provider database filename. */
+  /* Unique ID, corresponding to provider database filename. */
   public String id;
   public String overviewPage;
   public Integer status;

src/main/java/chat/delta/rpc/types/Qr.java

@@ -17,45 +17,45 @@ public abstract class Qr {
  * If the user agrees, pass this QR code to [`crate::securejoin::join_securejoin`].
  */
   public static class AskVerifyContact extends Qr {
-    /** Authentication code. */
+    /* Authentication code. */
     public String authcode;
-    /** ID of the contact. */
+    /* ID of the contact. */
     public Integer contact_id;
-    /** Fingerprint of the contact key as scanned from the QR code. */
+    /* Fingerprint of the contact key as scanned from the QR code. */
     public String fingerprint;
-    /** Invite number. */
+    /* Invite number. */
     public String invitenumber;
   }
 
-/** Ask the user whether to join the group. */
+/* Ask the user whether to join the group. */
   public static class AskVerifyGroup extends Qr {
-    /** Authentication code. */
+    /* Authentication code. */
     public String authcode;
-    /** ID of the contact. */
+    /* ID of the contact. */
     public Integer contact_id;
-    /** Fingerprint of the contact key as scanned from the QR code. */
+    /* Fingerprint of the contact key as scanned from the QR code. */
     public String fingerprint;
-    /** Group ID. */
+    /* Group ID. */
     public String grpid;
-    /** Group name. */
+    /* Group name. */
     public String grpname;
-    /** Invite number. */
+    /* Invite number. */
     public String invitenumber;
   }
 
-/** Ask the user whether to join the broadcast channel. */
+/* Ask the user whether to join the broadcast channel. */
   public static class AskJoinBroadcast extends Qr {
-    /** Authentication code. */
+    /* Authentication code. */
     public String authcode;
-    /** ID of the contact who owns the broadcast channel and created the QR code. */
+    /* ID of the contact who owns the broadcast channel and created the QR code. */
     public Integer contact_id;
-    /** Fingerprint of the broadcast channel owner's key as scanned from the QR code. */
+    /* Fingerprint of the broadcast channel owner's key as scanned from the QR code. */
     public String fingerprint;
-    /** A string of random characters, uniquely identifying this broadcast channel across all databases/clients. Called `grpid` for historic reasons: The id of multi-user chats is always called `grpid` in the database because groups were once the only multi-user chats. */
+    /* A string of random characters, uniquely identifying this broadcast channel across all databases/clients. Called `grpid` for historic reasons: The id of multi-user chats is always called `grpid` in the database because groups were once the only multi-user chats. */
     public String grpid;
-    /** Invite number. */
+    /* Invite number. */
     public String invitenumber;
-    /** The user-visible name of this broadcast channel */
+    /* The user-visible name of this broadcast channel */
     public String name;
   }
 
@@ -65,41 +65,41 @@ public abstract class Qr {
  * Ask the user if they want to start chatting.
  */
   public static class FprOk extends Qr {
-    /** Contact ID. */
+    /* Contact ID. */
     public Integer contact_id;
   }
 
-/** Scanned fingerprint does not match the last seen fingerprint. */
+/* Scanned fingerprint does not match the last seen fingerprint. */
   public static class FprMismatch extends Qr {
-    /** Contact ID. */
+    /* Contact ID. */
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public Integer contact_id;
   }
 
-/** The scanned QR code contains a fingerprint but no e-mail address. */
+/* The scanned QR code contains a fingerprint but no e-mail address. */
   public static class FprWithoutAddr extends Qr {
-    /** Key fingerprint. */
+    /* Key fingerprint. */
     public String fingerprint;
   }
 
-/** Ask the user if they want to create an account on the given domain. */
+/* Ask the user if they want to create an account on the given domain. */
   public static class Account extends Qr {
-    /** Server domain name. */
+    /* Server domain name. */
     public String domain;
   }
 
-/** Provides a backup that can be retrieved using iroh-net based backup transfer protocol. */
+/* Provides a backup that can be retrieved using iroh-net based backup transfer protocol. */
   public static class Backup2 extends Qr {
-    /** Authentication token. */
+    /* Authentication token. */
     public String auth_token;
-    /** Iroh node address. */
+    /* Iroh node address. */
     public String node_addr;
   }
 
   public static class BackupTooNew extends Qr {
   }
 
-/** Ask the user if they want to use the given service for video chats. */
+/* Ask the user if they want to use the given service for video chats. */
   public static class WebrtcInstance extends Qr {
     public String domain;
     public String instance_pattern;
@@ -111,9 +111,9 @@ public abstract class Qr {
  * Note that HTTP(S) URLs without a path and query parameters are treated as HTTP(S) proxy URL. UI may want to still offer to open the URL in the browser if QR code contents starts with `http://` or `https://` and the QR code was not scanned from the proxy configuration screen.
  */
   public static class Proxy extends Qr {
-    /** Host extracted from the URL to display in the UI. */
+    /* Host extracted from the URL to display in the UI. */
     public String host;
-    /** Port extracted from the URL to display in the UI. */
+    /* Port extracted from the URL to display in the UI. */
     public Integer port;
     /**
      * Proxy URL.
@@ -129,9 +129,9 @@ public abstract class Qr {
  * Optionally, a draft message could be provided. Ask the user if they want to start chatting.
  */
   public static class Addr extends Qr {
-    /** Contact ID. */
+    /* Contact ID. */
     public Integer contact_id;
-    /** Draft message. */
+    /* Draft message. */
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
     public String draft;
   }
@@ -154,91 +154,91 @@ public abstract class Qr {
     public String text;
   }
 
-/** Ask the user if they want to withdraw their own QR code. */
+/* Ask the user if they want to withdraw their own QR code. */
   public static class WithdrawVerifyContact extends Qr {
-    /** Authentication code. */
+    /* Authentication code. */
     public String authcode;
-    /** Contact ID. */
+    /* Contact ID. */
     public Integer contact_id;
-    /** Fingerprint of the contact key as scanned from the QR code. */
+    /* Fingerprint of the contact key as scanned from the QR code. */
     public String fingerprint;
-    /** Invite number. */
+    /* Invite number. */
     public String invitenumber;
   }
 
-/** Ask the user if they want to withdraw their own group invite QR code. */
+/* Ask the user if they want to withdraw their own group invite QR code. */
   public static class WithdrawVerifyGroup extends Qr {
-    /** Authentication code. */
+    /* Authentication code. */
     public String authcode;
-    /** Contact ID. */
+    /* Contact ID. */
     public Integer contact_id;
-    /** Fingerprint of the contact key as scanned from the QR code. */
+    /* Fingerprint of the contact key as scanned from the QR code. */
     public String fingerprint;
-    /** Group ID. */
+    /* Group ID. */
     public String grpid;
-    /** Group name. */
+    /* Group name. */
     public String grpname;
-    /** Invite number. */
+    /* Invite number. */
     public String invitenumber;
   }
 
-/** Ask the user if they want to withdraw their own broadcast channel invite QR code. */
+/* Ask the user if they want to withdraw their own broadcast channel invite QR code. */
   public static class WithdrawJoinBroadcast extends Qr {
-    /** Authentication code. */
+    /* Authentication code. */
     public String authcode;
-    /** Contact ID. Always `ContactId::SELF`. */
+    /* Contact ID. Always `ContactId::SELF`. */
     public Integer contact_id;
-    /** Fingerprint of the contact key as scanned from the QR code. */
+    /* Fingerprint of the contact key as scanned from the QR code. */
     public String fingerprint;
-    /** ID, uniquely identifying this chat. Called grpid for historic reasons. */
+    /* ID, uniquely identifying this chat. Called grpid for historic reasons. */
     public String grpid;
-    /** Invite number. */
+    /* Invite number. */
     public String invitenumber;
-    /** Broadcast name. */
+    /* Broadcast name. */
     public String name;
   }
 
-/** Ask the user if they want to revive their own QR code. */
+/* Ask the user if they want to revive their own QR code. */
   public static class ReviveVerifyContact extends Qr {
-    /** Authentication code. */
+    /* Authentication code. */
     public String authcode;
-    /** Contact ID. */
+    /* Contact ID. */
     public Integer contact_id;
-    /** Fingerprint of the contact key as scanned from the QR code. */
+    /* Fingerprint of the contact key as scanned from the QR code. */
     public String fingerprint;
-    /** Invite number. */
+    /* Invite number. */
     public String invitenumber;
   }
 
-/** Ask the user if they want to revive their own group invite QR code. */
+/* Ask the user if they want to revive their own group invite QR code. */
   public static class ReviveVerifyGroup extends Qr {
-    /** Authentication code. */
+    /* Authentication code. */
     public String authcode;
-    /** Contact ID. */
+    /* Contact ID. */
     public Integer contact_id;
-    /** Fingerprint of the contact key as scanned from the QR code. */
+    /* Fingerprint of the contact key as scanned from the QR code. */
     public String fingerprint;
-    /** Group ID. */
+    /* Group ID. */
     public String grpid;
-    /** Contact ID. */
+    /* Contact ID. */
     public String grpname;
-    /** Invite number. */
+    /* Invite number. */
     public String invitenumber;
   }
 
-/** Ask the user if they want to revive their own broadcast channel invite QR code. */
+/* Ask the user if they want to revive their own broadcast channel invite QR code. */
   public static class ReviveJoinBroadcast extends Qr {
-    /** Authentication code. */
+    /* Authentication code. */
     public String authcode;
-    /** Contact ID. Always `ContactId::SELF`. */
+    /* Contact ID. Always `ContactId::SELF`. */
     public Integer contact_id;
-    /** Fingerprint of the contact key as scanned from the QR code. */
+    /* Fingerprint of the contact key as scanned from the QR code. */
     public String fingerprint;
-    /** Globally unique chat ID. Called grpid for historic reasons. */
+    /* Globally unique chat ID. Called grpid for historic reasons. */
     public String grpid;
-    /** Invite number. */
+    /* Invite number. */
     public String invitenumber;
-    /** Broadcast name. */
+    /* Broadcast name. */
     public String name;
   }
 

src/main/java/chat/delta/rpc/types/Reaction.java

@@ -1,12 +1,12 @@
 /* Autogenerated file, do not edit manually */
 package chat.delta.rpc.types;
 
-/** A single reaction emoji. */
+/* A single reaction emoji. */
 public class Reaction {
-  /** Emoji frequency. */
+  /* Emoji frequency. */
   public Integer count;
-  /** Emoji. */
+  /* Emoji. */
   public String emoji;
-  /** True if we reacted with this emoji. */
+  /* True if we reacted with this emoji. */
   public Boolean isFromSelf;
 }

src/main/java/chat/delta/rpc/types/Reactions.java

@@ -1,10 +1,10 @@
 /* Autogenerated file, do not edit manually */
 package chat.delta.rpc.types;
 
-/** Structure representing all reactions to a particular message. */
+/* Structure representing all reactions to a particular message. */
 public class Reactions {
-  /** Unique reactions and their count, sorted in descending order. */
+  /* Unique reactions and their count, sorted in descending order. */
   public java.util.List<Reaction> reactions;
-  /** Map from a contact to it's reaction to message. */
+  /* Map from a contact to it's reaction to message. */
   public java.util.Map<String, java.util.List<String>> reactionsByContact;
 }

src/main/java/chat/delta/rpc/types/SecurejoinSource.java

@@ -2,21 +2,21 @@
 package chat.delta.rpc.types;
 
 public enum SecurejoinSource {
-  /** Because of some problem, it is unknown where the QR code came from. */
+  /* Because of some problem, it is unknown where the QR code came from. */
   Unknown,
 
-  /** The user opened a link somewhere outside Delta Chat */
+  /* The user opened a link somewhere outside Delta Chat */
   ExternalLink,
 
-  /** The user clicked on a link in a message inside Delta Chat */
+  /* The user clicked on a link in a message inside Delta Chat */
   InternalLink,
 
-  /** The user clicked "Paste from Clipboard" in the QR scan activity */
+  /* The user clicked "Paste from Clipboard" in the QR scan activity */
   Clipboard,
 
-  /** The user clicked "Load QR code as image" in the QR scan activity */
+  /* The user clicked "Load QR code as image" in the QR scan activity */
   ImageLoaded,
 
-  /** The user scanned a QR code */
+  /* The user scanned a QR code */
   Scan,
 }

src/main/java/chat/delta/rpc/types/SecurejoinUiPath.java

@@ -2,12 +2,12 @@
 package chat.delta.rpc.types;
 
 public enum SecurejoinUiPath {
-  /** The UI path is unknown, or the user didn't open the QR code screen at all. */
+  /* The UI path is unknown, or the user didn't open the QR code screen at all. */
   Unknown,
 
-  /** The user directly clicked on the QR icon in the main screen */
+  /* The user directly clicked on the QR icon in the main screen */
   QrIcon,
 
-  /** The user first clicked on the `+` button in the main screen, and then on "New Contact" */
+  /* The user first clicked on the `+` button in the main screen, and then on "New Contact" */
   NewContact,
 }

src/main/java/chat/delta/rpc/types/Socket.java

@@ -2,15 +2,15 @@
 package chat.delta.rpc.types;
 
 public enum Socket {
-  /** Unspecified socket security, select automatically. */
+  /* Unspecified socket security, select automatically. */
   automatic,
 
-  /** TLS connection. */
+  /* TLS connection. */
   ssl,
 
-  /** STARTTLS connection. */
+  /* STARTTLS connection. */
   starttls,
 
-  /** No TLS, plaintext connection. */
+  /* No TLS, plaintext connection. */
   plain,
 }

src/main/java/chat/delta/rpc/types/SystemMessageType.java

@@ -19,21 +19,21 @@ public enum SystemMessageType {
   CallAccepted,
   CallEnded,
 
-  /** 1:1 chats info message telling that SecureJoin has started and the user should wait for it to complete. */
+  /* 1:1 chats info message telling that SecureJoin has started and the user should wait for it to complete. */
   SecurejoinWait,
 
-  /** 1:1 chats info message telling that SecureJoin is still running, but the user may already send messages. */
+  /* 1:1 chats info message telling that SecureJoin is still running, but the user may already send messages. */
   SecurejoinWaitTimeout,
 
-  /** Chat ephemeral message timer is changed. */
+  /* Chat ephemeral message timer is changed. */
   EphemeralTimerChanged,
 
-  /** Self-sent-message that contains only json used for multi-device-sync; if possible, we attach that to other messages as for locations. */
+  /* Self-sent-message that contains only json used for multi-device-sync; if possible, we attach that to other messages as for locations. */
   MultiDeviceSync,
 
-  /** Webxdc info added with `info` set in `send_webxdc_status_update()`. */
+  /* Webxdc info added with `info` set in `send_webxdc_status_update()`. */
   WebxdcInfoMessage,
 
-  /** This message contains a users iroh node address. */
+  /* This message contains a users iroh node address. */
   IrohNodeAddr,
 }

src/main/java/chat/delta/rpc/types/VcardContact.java

@@ -2,19 +2,19 @@
 package chat.delta.rpc.types;
 
 public class VcardContact {
-  /** Email address. */
+  /* Email address. */
   public String addr;
-  /** Contact color as hex string. */
+  /* Contact color as hex string. */
   public String color;
-  /** The contact's name, or the email address if no name was given. */
+  /* The contact's name, or the email address if no name was given. */
   public String displayName;
-  /** Public PGP key in Base64. */
+  /* Public PGP key in Base64. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String key;
-  /** Profile image in Base64. */
+  /* Profile image in Base64. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String profileImage;
-  /** Last update timestamp. */
+  /* Last update timestamp. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public Integer timestamp;
 }

src/main/java/chat/delta/rpc/types/Viewtype.java

@@ -4,13 +4,13 @@ package chat.delta.rpc.types;
 public enum Viewtype {
   Unknown,
 
-  /** Text message. */
+  /* Text message. */
   Text,
 
-  /** Image message. If the image is an animated GIF, the type `Viewtype.Gif` should be used. */
+  /* Image message. If the image is an animated GIF, the type `Viewtype.Gif` should be used. */
   Image,
 
-  /** Animated GIF message. */
+  /* Animated GIF message. */
   Gif,
 
   /**
@@ -20,24 +20,24 @@ public enum Viewtype {
    */
   Sticker,
 
-  /** Message containing an Audio file. */
+  /* Message containing an Audio file. */
   Audio,
 
-  /** A voice message that was directly recorded by the user. For all other audio messages, the type `Viewtype.Audio` should be used. */
+  /* A voice message that was directly recorded by the user. For all other audio messages, the type `Viewtype.Audio` should be used. */
   Voice,
 
-  /** Video messages. */
+  /* Video messages. */
   Video,
 
-  /** Message containing any file, eg. a PDF. */
+  /* Message containing any file, eg. a PDF. */
   File,
 
-  /** Message is a call. */
+  /* Message is a call. */
   Call,
 
-  /** Message is an webxdc instance. */
+  /* Message is an webxdc instance. */
   Webxdc,
 
-  /** Message containing shared contacts represented as a vCard (virtual contact file) with email addresses and possibly other fields. Use `parse_vcard()` to retrieve them. */
+  /* Message containing shared contacts represented as a vCard (virtual contact file) with email addresses and possibly other fields. Use `parse_vcard()` to retrieve them. */
   Vcard,
 }

src/main/java/chat/delta/rpc/types/WebxdcMessageInfo.java

@@ -2,7 +2,7 @@
 package chat.delta.rpc.types;
 
 public class WebxdcMessageInfo {
-  /** if the Webxdc represents a document, then this is the name of the document */
+  /* if the Webxdc represents a document, then this is the name of the document */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String document;
   /**
@@ -13,7 +13,7 @@ public class WebxdcMessageInfo {
    * App icons should should be square, the implementations will add round corners etc. as needed.
    */
   public String icon;
-  /** True if full internet access should be granted to the app. */
+  /* True if full internet access should be granted to the app. */
   public Boolean internetAccess;
   /**
    * The name of the app.
@@ -21,16 +21,16 @@ public class WebxdcMessageInfo {
    * Defaults to the filename if not set in the manifest.
    */
   public String name;
-  /** Address to be used for `window.webxdc.selfAddr` in JS land. */
+  /* Address to be used for `window.webxdc.selfAddr` in JS land. */
   public String selfAddr;
-  /** Milliseconds to wait before calling `sendUpdate()` again since the last call. Should be exposed to `window.sendUpdateInterval` in JS land. */
+  /* Milliseconds to wait before calling `sendUpdate()` again since the last call. Should be exposed to `window.sendUpdateInterval` in JS land. */
   public Integer sendUpdateInterval;
-  /** Maximum number of bytes accepted for a serialized update object. Should be exposed to `window.sendUpdateMaxSize` in JS land. */
+  /* Maximum number of bytes accepted for a serialized update object. Should be exposed to `window.sendUpdateMaxSize` in JS land. */
   public Integer sendUpdateMaxSize;
-  /** URL where the source code of the Webxdc and other information can be found; defaults to an empty string. Implementations may offer an menu or a button to open this URL. */
+  /* URL where the source code of the Webxdc and other information can be found; defaults to an empty string. Implementations may offer an menu or a button to open this URL. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String sourceCodeUrl;
-  /** short string describing the state of the app, sth. as "2 votes", "Highscore: 123", can be changed by the apps */
+  /* short string describing the state of the app, sth. as "2 votes", "Highscore: 123", can be changed by the apps */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String summary;
 }

src/main/java/com/b44t/messenger/DcAccounts.java

@@ -4,7 +4,6 @@ public class DcAccounts {
 
     public DcAccounts(String dir) {
         accountsCPtr = createAccountsCPtr(dir);
-        if (accountsCPtr == 0) throw new RuntimeException("createAccountsCPtr() returned null pointer");
     }
 
     @Override

src/main/java/com/b44t/messenger/DcContext.java

@@ -35,7 +35,6 @@ public class DcContext {
     public final static int DC_EVENT_INCOMING_CALL_ACCEPTED      = 2560;
     public final static int DC_EVENT_OUTGOING_CALL_ACCEPTED      = 2570;
     public final static int DC_EVENT_CALL_ENDED                  = 2580;
-    public final static int DC_EVENT_TRANSPORTS_MODIFIED         = 2600;
 
     public final static int DC_IMEX_EXPORT_SELF_KEYS = 1;
     public final static int DC_IMEX_IMPORT_SELF_KEYS = 2;

src/main/java/org/thoughtcrime/securesms/AllMediaDocumentsFragment.java

@@ -54,6 +54,7 @@ public class AllMediaDocumentsFragment
   public void onCreate(Bundle bundle) {
     super.onCreate(bundle);
 
+    dcContext = DcHelper.getContext(getContext());
     chatId = getArguments().getInt(CHAT_ID_EXTRA, -1);
     viewtype1 = getArguments().getInt(VIEWTYPE1, 0);
     viewtype2 = getArguments().getInt(VIEWTYPE2, 0);
@@ -69,9 +70,6 @@ public class AllMediaDocumentsFragment
     this.noMedia      = ViewUtil.findById(view, R.id.no_documents);
     this.gridManager  = new StickyHeaderGridLayoutManager(1);
 
-    // add padding to avoid content hidden behind system bars
-    ViewUtil.applyWindowInsets(recyclerView, true, false, true, true);
-
     this.recyclerView.setAdapter(new AllMediaDocumentsAdapter(getContext(),
         new BucketedThreadMediaLoader.BucketedThreadMedia(getContext()),
         this));

src/main/java/org/thoughtcrime/securesms/AllMediaGalleryFragment.java

@@ -52,6 +52,7 @@ public class AllMediaGalleryFragment
   public void onCreate(Bundle bundle) {
     super.onCreate(bundle);
 
+    dcContext = DcHelper.getContext(getContext());
     chatId = getArguments().getInt(CHAT_ID_EXTRA, -1);
 
     getLoaderManager().initLoader(0, null, this);
@@ -65,9 +66,6 @@ public class AllMediaGalleryFragment
     this.noMedia      = ViewUtil.findById(view, R.id.no_images);
     this.gridManager  = new StickyHeaderGridLayoutManager(getCols());
 
-    // add padding to avoid content hidden behind system bars
-    ViewUtil.applyWindowInsets(recyclerView, true, false, true, true);
-
     this.recyclerView.setAdapter(new AllMediaGalleryAdapter(getContext(),
                                                          GlideApp.with(this),
                                                          new BucketedThreadMediaLoader.BucketedThreadMedia(getContext()),

src/main/java/org/thoughtcrime/securesms/ApplicationContext.java

@@ -45,7 +45,6 @@ import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.SignalProtocolLoggerProvider;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.webxdc.WebxdcGarbageCollectionWorker;
 
 import java.io.File;
 import java.io.PrintWriter;
@@ -57,16 +56,13 @@ import chat.delta.rpc.RpcException;
 
 public class ApplicationContext extends MultiDexApplication {
   private static final String TAG = ApplicationContext.class.getSimpleName();
-  private static final Object initLock = new Object();
-  private static volatile boolean isInitialized = false;
 
-  private static DcAccounts      dcAccounts;
-  private Rpc                    rpc;
-  private DcContext              dcContext;
-
-  private DcLocationManager      dcLocationManager;
-  private DcEventCenter          eventCenter;
-  private NotificationCenter     notificationCenter;
+  public static DcAccounts      dcAccounts;
+  public Rpc                    rpc;
+  public DcContext              dcContext;
+  public DcLocationManager      dcLocationManager;
+  public DcEventCenter          eventCenter;
+  public NotificationCenter     notificationCenter;
   private JobManager            jobManager;
 
   private int                   debugOnAvailableCount;
@@ -78,84 +74,6 @@ public class ApplicationContext extends MultiDexApplication {
     return (ApplicationContext)context.getApplicationContext();
   }
 
-  private static void ensureInitialized() {
-    synchronized (initLock) {
-      while (!isInitialized) {
-        try {
-          initLock.wait();
-        } catch (InterruptedException e) {
-          Thread.currentThread().interrupt();
-          throw new RuntimeException("Interrupted while waiting for initialization", e);
-        }
-      }
-    }
-  }
-
-  /**
-   * Get DcAccounts instance, waiting for initialization if necessary.
-   * This method is thread-safe and will block until initialization is complete.
-   */
-  public static DcAccounts getDcAccounts() {
-    ensureInitialized();
-    return dcAccounts;
-  }
-
-  /**
-   * Get Rpc instance, waiting for initialization if necessary.
-   * This method is thread-safe and will block until initialization is complete.
-   */
-  public Rpc getRpc() {
-    ensureInitialized();
-    return rpc;
-  }
-
-  /**
-   * Get DcContext instance, waiting for initialization if necessary.
-   * This method is thread-safe and will block until initialization is complete.
-   */
-  public DcContext getDcContext() {
-    ensureInitialized();
-    return dcContext;
-  }
-
-  /**
-   * Set DcContext instance. This should only be called by AccountManager when switching accounts,
-   * which only happens after initial initialization is complete.
-   * This method is thread-safe but does NOT trigger initialization or notify waiting threads.
-   */
-  public void setDcContext(DcContext dcContext) {
-    synchronized (initLock) {
-      this.dcContext = dcContext;
-    }
-  }
-
-  /**
-   * Get DcLocationManager instance, waiting for initialization if necessary.
-   * This method is thread-safe and will block until initialization is complete.
-   */
-  public DcLocationManager getLocationManager() {
-    ensureInitialized();
-    return dcLocationManager;
-  }
-
-  /**
-   * Get DcEventCenter instance, waiting for initialization if necessary.
-   * This method is thread-safe and will block until initialization is complete.
-   */
-  public DcEventCenter getEventCenter() {
-    ensureInitialized();
-    return eventCenter;
-  }
-
-  /**
-   * Get NotificationCenter instance, waiting for initialization if necessary.
-   * This method is thread-safe and will block until initialization is complete.
-   */
-  public NotificationCenter getNotificationCenter() {
-    ensureInitialized();
-    return notificationCenter;
-  }
-
   @Override
   public void onCreate() {
     super.onCreate();
@@ -191,91 +109,62 @@ public class ApplicationContext extends MultiDexApplication {
 
     System.loadLibrary("native-utils");
 
-    // Initialize DcAccounts in background to avoid ANR during SQL migrations
-    Util.runOnBackground(() -> {
-      synchronized (initLock) {
-        try {
-          dcAccounts = new DcAccounts(new File(getFilesDir(), "accounts").getAbsolutePath());
-          Log.i(TAG, "DcAccounts created");
-          rpc = new Rpc(new FFITransport(dcAccounts.getJsonrpcInstance()));
-          Log.i(TAG, "Rpc created");
-          AccountManager.getInstance().migrateToDcAccounts(this);
-
-          int[] allAccounts = dcAccounts.getAll();
-          Log.i(TAG, "Number of profiles: " + allAccounts.length);
-          for (int accountId : allAccounts) {
-            DcContext ac = dcAccounts.getAccount(accountId);
-            if (!ac.isOpen()) {
-              try {
-                DatabaseSecret secret = DatabaseSecretProvider.getOrCreateDatabaseSecret(this, accountId);
-                boolean res = ac.open(secret.asString());
-                if (res) Log.i(TAG, "Successfully opened account " + accountId + ", path: " + ac.getBlobdir());
-                else Log.e(TAG, "Error opening account " + accountId + ", path: " + ac.getBlobdir());
-              } catch (Exception e) {
-                Log.e(TAG, "Failed to open account " + accountId + ", path: " + ac.getBlobdir() + ": " + e);
-                e.printStackTrace();
-              }
-            }
-
-            // 2025-12-16: The setting was removed.
-            // Revert it to the default if it was changed in the past.
-            ac.setConfigInt("webxdc_realtime_enabled", 1);
-
-            // 2025-11-12: this is needed until core starts ignoring "delete_server_after" for chatmail
-            if (ac.isChatmail()) {
-              ac.setConfig("delete_server_after", null); // reset
-            }
-          }
-          if (allAccounts.length == 0) {
-            try {
-              rpc.addAccount();
-            } catch (RpcException e) {
-              e.printStackTrace();
-            }
-          }
-          dcContext = dcAccounts.getSelectedAccount();
-          notificationCenter = new NotificationCenter(this);
-          eventCenter = new DcEventCenter(this);
-          dcLocationManager = new DcLocationManager(this, dcContext);
-
-          // Mark as initialized before starting threads that depend on it
-          isInitialized = true;
-          initLock.notifyAll();
-          Log.i(TAG, "DcAccounts initialization complete");
-
-          new Thread(() -> {
-              Log.i(TAG, "Starting event loop");
-              DcEventEmitter emitter = dcAccounts.getEventEmitter();
-              Log.i(TAG, "DcEventEmitter obtained");
-              while (true) {
-                DcEvent event = emitter.getNextEvent();
-                if (event==null) {
-                  break;
-                }
-                eventCenter.handleEvent(event);
-              }
-              Log.i("DeltaChat", "shutting down event handler");
-          }, "eventThread").start();
-
-          // set translations before starting I/O to avoid sending untranslated MDNs (issue #2288)
-          DcHelper.setStockTranslations(this);
-
-          dcAccounts.startIo();
-        } catch (Exception e) {
-          Log.e(TAG, "Fatal error during DcAccounts initialization", e);
-          // Mark as initialized even on error to avoid deadlock
-          isInitialized = true;
-          initLock.notifyAll();
-          throw new RuntimeException("Failed to initialize DcAccounts", e);
-        }
-      }
-    });
+    dcAccounts = new DcAccounts(new File(getFilesDir(), "accounts").getAbsolutePath());
+    rpc = new Rpc(new FFITransport(dcAccounts.getJsonrpcInstance()));
+    AccountManager.getInstance().migrateToDcAccounts(this);
 
     // October-2025 migration: delete deprecated "permanent channel" id
     NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
     notificationManager.deleteNotificationChannel("dc_foreground_notification_ch");
     // end October-2025 migration
 
+    int[] allAccounts = dcAccounts.getAll();
+    for (int accountId : allAccounts) {
+      DcContext ac = dcAccounts.getAccount(accountId);
+      if (!ac.isOpen()) {
+        try {
+          DatabaseSecret secret = DatabaseSecretProvider.getOrCreateDatabaseSecret(this, accountId);
+          boolean res = ac.open(secret.asString());
+          if (res) Log.i(TAG, "Successfully opened account " + accountId + ", path: " + ac.getBlobdir());
+          else Log.e(TAG, "Error opening account " + accountId + ", path: " + ac.getBlobdir());
+        } catch (Exception e) {
+          Log.e(TAG, "Failed to open account " + accountId + ", path: " + ac.getBlobdir() + ": " + e);
+          e.printStackTrace();
+        }
+      }
+
+      // 2025.11.12: this is needed until core starts ignoring "delete_server_after" for chatmail
+      if (ac.isChatmail()) {
+        ac.setConfig("delete_server_after", null); // reset
+      }
+    }
+    if (allAccounts.length == 0) {
+      try {
+        rpc.addAccount();
+      } catch (RpcException e) {
+        e.printStackTrace();
+      }
+    }
+    dcContext = dcAccounts.getSelectedAccount();
+    notificationCenter = new NotificationCenter(this);
+    eventCenter = new DcEventCenter(this);
+    new Thread(() -> {
+      DcEventEmitter emitter = dcAccounts.getEventEmitter();
+      while (true) {
+        DcEvent event = emitter.getNextEvent();
+        if (event==null) {
+          break;
+        }
+        eventCenter.handleEvent(event);
+      }
+      Log.i("DeltaChat", "shutting down event handler");
+    }, "eventThread").start();
+
+    // set translations before starting I/O to avoid sending untranslated MDNs (issue #2288)
+    DcHelper.setStockTranslations(this);
+
+    dcAccounts.startIo();
+
     new ForegroundDetector(ApplicationContext.getInstance(this));
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -285,7 +174,7 @@ public class ApplicationContext extends MultiDexApplication {
         @Override
         public void onAvailable(@NonNull android.net.Network network) {
           Log.i("DeltaChat", "++++++++++++++++++ NetworkCallback.onAvailable() #" + debugOnAvailableCount++);
-          getDcAccounts().maybeNetwork();
+          dcAccounts.maybeNetwork();
         }
 
         @Override
@@ -314,6 +203,7 @@ public class ApplicationContext extends MultiDexApplication {
     initializeJobManager();
     InChatSounds.getInstance(this);
 
+    dcLocationManager = new DcLocationManager(this);
     DynamicTheme.setDefaultDayNightMode(this);
 
     IntentFilter filter = new IntentFilter(Intent.ACTION_LOCALE_CHANGED);
@@ -350,20 +240,6 @@ public class ApplicationContext extends MultiDexApplication {
               ExistingPeriodicWorkPolicy.KEEP,
               fetchWorkRequest);
     }
-
-    PeriodicWorkRequest webxdcGarbageCollectionRequest = new PeriodicWorkRequest.Builder(
-            WebxdcGarbageCollectionWorker.class,
-            PeriodicWorkRequest.MIN_PERIODIC_INTERVAL_MILLIS,
-            TimeUnit.MILLISECONDS,
-            PeriodicWorkRequest.MIN_PERIODIC_FLEX_MILLIS,
-            TimeUnit.MILLISECONDS)
-            .build();
-    WorkManager.getInstance(this).enqueueUniquePeriodicWork(
-            "WebxdcGarbageCollectionWorker",
-            ExistingPeriodicWorkPolicy.KEEP,
-            webxdcGarbageCollectionRequest);
-
-    Log.i("DeltaChat", "+++++++++++ ApplicationContext.onCreate() finished ++++++++++");
   }
 
   public JobManager getJobManager() {

src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java

@@ -49,7 +49,6 @@ import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.IntentUtils;
 import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.ScreenLockUtil;
-import org.thoughtcrime.securesms.util.ViewUtil;
 
 /**
  * The Activity for application preference display and management.
@@ -80,9 +79,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
 
     //noinspection ConstantConditions
     this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-    // add padding to avoid content hidden behind system bars
-    ViewUtil.applyWindowInsets(findViewById(R.id.fragment));
+    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
 
     if (icicle == null) {
       initFragment(R.id.fragment, new ApplicationPreferenceFragment());

src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java

@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms;
 
-import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -18,7 +17,6 @@ import androidx.fragment.app.Fragment;
 
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Prefs;
-import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.lang.reflect.Field;
 
@@ -35,24 +33,9 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     onPreCreate();
+    EdgeToEdge.enable(this);  // docs says to use: WindowCompat.enableEdgeToEdge(getWindow()); but it is not available
     super.onCreate(savedInstanceState);
-
-    // Only enable Edge-to-Edge if it is well supported
-    if (ViewUtil.isEdgeToEdgeSupported()) {
-      // docs says to use: WindowCompat.enableEdgeToEdge(getWindow());
-      // but it actually makes things worse, the next takes care of setting the 3-buttons navigation bar background
-      EdgeToEdge.enable(this);
-
-      // force white text in status bar so it visible over background color
-      WindowCompat.getInsetsController(getWindow(), getWindow().getDecorView()).setAppearanceLightStatusBars(false);
-    }
-  }
-
-  @Override
-  protected void onPostCreate(@Nullable Bundle savedInstanceState) {
-    super.onPostCreate(savedInstanceState);
-    // Apply adjustments to the toolbar for edge-to-edge display
-    ViewUtil.adjustToolbarForE2E(this);
+    WindowCompat.getInsetsController(getWindow(), getWindow().getDecorView()).setAppearanceLightStatusBars(false); // force white text in status bar
   }
 
   @Override

src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java

@@ -1,10 +1,10 @@
 package org.thoughtcrime.securesms;
 
-import static org.thoughtcrime.securesms.util.ShareUtil.acquireRelayMessageContent;
-import static org.thoughtcrime.securesms.util.ShareUtil.getSharedText;
-import static org.thoughtcrime.securesms.util.ShareUtil.getSharedUris;
-import static org.thoughtcrime.securesms.util.ShareUtil.isForwarding;
-import static org.thoughtcrime.securesms.util.ShareUtil.isRelayingMessageContent;
+import static org.thoughtcrime.securesms.util.RelayUtil.acquireRelayMessageContent;
+import static org.thoughtcrime.securesms.util.RelayUtil.getSharedText;
+import static org.thoughtcrime.securesms.util.RelayUtil.getSharedUris;
+import static org.thoughtcrime.securesms.util.RelayUtil.isForwarding;
+import static org.thoughtcrime.securesms.util.RelayUtil.isRelayingMessageContent;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -36,7 +36,7 @@ import org.thoughtcrime.securesms.components.registration.PulsingFloatingActionB
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.connect.DirectShareUtil;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.ShareUtil;
+import org.thoughtcrime.securesms.util.RelayUtil;
 import org.thoughtcrime.securesms.util.SendRelayedMessageUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.task.SnackbarAsyncTask;
@@ -382,7 +382,7 @@ public abstract class BaseConversationListFragment extends Fragment implements A
   @Override
   public boolean onCreateActionMode(ActionMode mode, Menu menu) {
     if (isRelayingMessageContent(getActivity())) {
-      if (ShareUtil.getSharedContactId(getActivity()) != 0) {
+      if (RelayUtil.getSharedContactId(getActivity()) != 0) {
         return false; // no sharing of a contact to multiple recipients at the same time, we can reconsider when that becomes a real-world need
       }
       Context context = getContext();

src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java

@@ -33,6 +33,7 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
     setContentView(R.layout.activity_blocked_contacts);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     getSupportActionBar().setTitle(R.string.pref_blocked_contacts);
+    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
     initFragment(R.id.fragment, new BlockedAndShareContactsFragment(), getIntent().getExtras());
   }
 
@@ -59,10 +60,6 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
       View view = inflater.inflate(R.layout.contact_selection_list_fragment, container, false);
       recyclerView  = ViewUtil.findById(view, R.id.recycler_view);
       recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
-
-      // add padding to avoid content hidden behind system bars
-      ViewUtil.applyWindowInsets(recyclerView);
-
       emptyStateView = ViewUtil.findById(view, android.R.id.empty);
       emptyStateView.setText(R.string.blocked_empty_hint);
       return view;

src/main/java/org/thoughtcrime/securesms/ContactMultiSelectionActivity.java

@@ -23,9 +23,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Activity container for selecting a list of contacts.
@@ -36,9 +34,6 @@ import java.util.Set;
 public class ContactMultiSelectionActivity extends ContactSelectionActivity {
 
   public static final String CONTACTS_EXTRA = "contacts_extra";
-  public static final String REMOVED_CONTACTS_EXTRA = "removed_contacts_extra";
-  
-  private ArrayList<Integer> preselectedContacts;
 
   @Override
   protected void onCreate(Bundle icicle, boolean ready) {
@@ -49,9 +44,6 @@ public class ContactMultiSelectionActivity extends ContactSelectionActivity {
     // it's a bit confusing having one "X" button on the left and one on the right -
     // and the "clear search" button is not that important.
     getToolbar().setUseClearButton(false);
-    
-    // Store preselected contacts to track which ones were removed
-    preselectedContacts = getIntent().getIntegerArrayListExtra(ContactSelectionListFragment.PRESELECTED_CONTACTS);
   }
 
   @Override
@@ -80,19 +72,6 @@ public class ContactMultiSelectionActivity extends ContactSelectionActivity {
     Intent resultIntent = getIntent();
     List<Integer> selectedContacts = contactsFragment.getSelectedContacts();
     resultIntent.putIntegerArrayListExtra(CONTACTS_EXTRA, new ArrayList<>(selectedContacts));
-    
-    // Calculate which contacts were removed (preselected but not in final selection)
-    if (preselectedContacts != null) {
-      Set<Integer> selectedSet = new HashSet<>(selectedContacts);
-      ArrayList<Integer> removedContacts = new ArrayList<>();
-      for (Integer preselectedId : preselectedContacts) {
-        if (!selectedSet.contains(preselectedId)) {
-          removedContacts.add(preselectedId);
-        }
-      }
-      resultIntent.putIntegerArrayListExtra(REMOVED_CONTACTS_EXTRA, removedContacts);
-    }
-    
     setResult(RESULT_OK, resultIntent);
   }
 }

src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java

@@ -81,9 +81,8 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);
 
-    if (item.getItemId() == android.R.id.home) {
-      getOnBackPressedDispatcher().onBackPressed();
-      return true;
+    switch (item.getItemId()) {
+      case android.R.id.home:   super.onBackPressed(); return true;
     }
 
     return false;

src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java

@@ -17,12 +17,15 @@
 package org.thoughtcrime.securesms;
 
 
-import static org.thoughtcrime.securesms.util.ShareUtil.isRelayingMessageContent;
+import static org.thoughtcrime.securesms.util.RelayUtil.isRelayingMessageContent;
 
+import android.Manifest;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
+import android.os.AsyncTask;
 import android.os.Bundle;
-import android.text.TextUtils;
+import android.util.Log;
 import android.util.SparseIntArray;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -30,7 +33,6 @@ import android.view.MenuInflater;
 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;
@@ -49,11 +51,13 @@ import com.b44t.messenger.DcEvent;
 import org.thoughtcrime.securesms.connect.DcContactsLoader;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
+import org.thoughtcrime.securesms.contacts.ContactAccessor;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListItem;
 import org.thoughtcrime.securesms.contacts.NewContactActivity;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.qr.QrActivity;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
@@ -86,7 +90,6 @@ public class ContactSelectionListFragment extends    Fragment
   private OnContactSelectedListener onContactSelectedListener;
   private String                    cursorFilter;
   private RecyclerView              recyclerView;
-  private TextView                  emptyView;
   private ActionMode                actionMode;
   private ActionMode.Callback       actionModeCallback;
 
@@ -109,6 +112,13 @@ public class ContactSelectionListFragment extends    Fragment
   public void onStart() {
     super.onStart();
     this.getLoaderManager().initLoader(0, null, this);
+    if (dcContext.getConfigInt("ui.android.show_system_contacts") != 0 && !dcContext.isChatmail()) {
+      Permissions.with(this)
+        .request(Manifest.permission.READ_CONTACTS)
+        .ifNecessary()
+        .onAllGranted(this::handleContactPermissionGranted)
+        .execute();
+    }
   }
 
   @Override
@@ -116,18 +126,14 @@ public class ContactSelectionListFragment extends    Fragment
     View view = inflater.inflate(R.layout.contact_selection_list_fragment, container, false);
 
     recyclerView            = ViewUtil.findById(view, R.id.recycler_view);
-    emptyView               = ViewUtil.findById(view, android.R.id.empty);
-
-    // add padding to avoid content hidden behind system bars
-    ViewUtil.applyWindowInsets(recyclerView, true, false, true, true);
-
     recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
     actionModeCallback = new ActionMode.Callback() {
       @Override
       public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
         MenuInflater inflater = getActivity().getMenuInflater();
         inflater.inflate(R.menu.contact_list, menu);
-        updateActionModeState(actionMode);
+        setCorrectMenuVisibility(menu);
+        actionMode.setTitle("1");
         return true;
       }
 
@@ -164,16 +170,19 @@ public class ContactSelectionListFragment extends    Fragment
 
   private void handleSelectAll() {
     getContactSelectionListAdapter().selectAll();
-    updateActionModeState(actionMode);
+    updateActionModeTitle();
   }
 
-  private void updateActionModeState(ActionMode actionMode) {
-    int size = getContactSelectionListAdapter().getActionModeSelection().size();
-    if (size == 0) {
-      actionMode.finish();
+  private void updateActionModeTitle() {
+    actionMode.setTitle(String.valueOf(getContactSelectionListAdapter().getActionModeSelection().size()));
+  }
+
+  private void setCorrectMenuVisibility(Menu menu) {
+    ContactSelectionListAdapter adapter = getContactSelectionListAdapter();
+    if (adapter.getActionModeSelection().size() > 1) {
+      menu.findItem(R.id.menu_view_profile).setVisible(false);
     } else {
-      actionMode.getMenu().findItem(R.id.menu_view_profile).setVisible(size == 1);
-      actionMode.setTitle(String.valueOf(size));
+      menu.findItem(R.id.menu_view_profile).setVisible(true);
     }
   }
 
@@ -266,16 +275,7 @@ public class ContactSelectionListFragment extends    Fragment
 
   @Override
   public void onLoadFinished(Loader<DcContactsLoader.Ret> loader, DcContactsLoader.Ret data) {
-    ContactSelectionListAdapter adapter = (ContactSelectionListAdapter) recyclerView.getAdapter();
-    adapter.changeData(data);
-    if (emptyView != null) {
-      if (adapter.getItemCount() > 0 || TextUtils.isEmpty(cursorFilter)) {
-        emptyView.setVisibility(View.GONE);
-      } else {
-        emptyView.setText(getString(R.string.search_no_result_for_x, cursorFilter));
-        emptyView.setVisibility(View.VISIBLE);
-      }
-    }
+    ((ContactSelectionListAdapter) recyclerView.getAdapter()).changeData(data);
   }
 
   @Override
@@ -283,13 +283,48 @@ public class ContactSelectionListFragment extends    Fragment
     ((ContactSelectionListAdapter) recyclerView.getAdapter()).changeData(null);
   }
 
+  @SuppressLint("StaticFieldLeak")
+  private void handleContactPermissionGranted() {
+    new AsyncTask<Void, Void, Void>() {
+
+      @Override
+      protected Void doInBackground(Void... voids) {
+        loadSystemContacts();
+        return null;
+      }
+
+    }.execute();
+  }
+
+  private void loadSystemContacts() {
+    Thread thread = new Thread() {
+      @Override
+      public void run() {
+        try {
+          ContactAccessor contactAccessor = ContactAccessor.getInstance();
+          String allSystemContacts = contactAccessor.getAllSystemContactsAsString(getContext());
+          if (!allSystemContacts.isEmpty()) {
+            dcContext.addAddressBook(allSystemContacts);
+          }
+        } catch (SecurityException e) {
+          Log.e(TAG, "Caught a weird bug in the Android OS https://github.com/deltachat/deltachat-android/issues/1639: " + e);
+          e.printStackTrace();
+        }
+      }
+    };
+    thread.start();
+  }
+
   private class ListClickListener implements ContactSelectionListAdapter.ItemClickListener {
     @Override
     public void onItemClick(ContactSelectionListItem contact, boolean handleActionMode)
     {
       if (handleActionMode) {
         if (actionMode != null) {
-          updateActionModeState(actionMode);
+          Menu menu = actionMode.getMenu();
+          setCorrectMenuVisibility(menu);
+          updateActionModeTitle();
+          finishActionModeIfSelectionIsEmpty();
         }
         return;
       }
@@ -327,11 +362,17 @@ public class ContactSelectionListFragment extends    Fragment
       if (actionMode == null) {
         actionMode = ((AppCompatActivity)getActivity()).startSupportActionMode(actionModeCallback);
       } else {
-        updateActionModeState(actionMode);
+          finishActionModeIfSelectionIsEmpty();
       }
     }
   }
 
+    private void finishActionModeIfSelectionIsEmpty() {
+        if (getContactSelectionListAdapter().getActionModeSelection().size() == 0) {
+            actionMode.finish();
+        }
+    }
+
     public void setOnContactSelectedListener(OnContactSelectedListener onContactSelectedListener) {
     this.onContactSelectedListener = onContactSelectedListener;
   }

src/main/java/org/thoughtcrime/securesms/ConversationActivity.java

@@ -17,9 +17,12 @@
 package org.thoughtcrime.securesms;
 
 import static org.thoughtcrime.securesms.TransportOption.Type;
-import static org.thoughtcrime.securesms.util.ShareUtil.getSharedText;
-import static org.thoughtcrime.securesms.util.ShareUtil.isForwarding;
-import static org.thoughtcrime.securesms.util.ShareUtil.isSharing;
+import static org.thoughtcrime.securesms.util.RelayUtil.getSharedHtml;
+import static org.thoughtcrime.securesms.util.RelayUtil.getSharedSubject;
+import static org.thoughtcrime.securesms.util.RelayUtil.getSharedText;
+import static org.thoughtcrime.securesms.util.RelayUtil.getSharedType;
+import static org.thoughtcrime.securesms.util.RelayUtil.isForwarding;
+import static org.thoughtcrime.securesms.util.RelayUtil.isSharing;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -57,7 +60,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
@@ -107,7 +109,7 @@ import org.thoughtcrime.securesms.scribbles.ScribbleActivity;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Prefs;
-import org.thoughtcrime.securesms.util.ShareUtil;
+import org.thoughtcrime.securesms.util.RelayUtil;
 import org.thoughtcrime.securesms.util.SendRelayedMessageUtil;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.Util;
@@ -188,6 +190,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   private ApplicationContext context;
   private Recipient  recipient;
+  private DcContext  dcContext;
   private Rpc rpc;
   private DcChat     dcChat                = new DcChat(0, 0);
   private int        chatId;
@@ -196,11 +199,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private boolean    isSecurityInitialized    = false;
   private boolean successfulForwardingAttempt = false;
   private boolean isEditing = false;
-  private boolean switchedProfile = false;
 
   @Override
   protected void onCreate(Bundle state, boolean ready) {
     this.context = ApplicationContext.getInstance(getApplicationContext());
+    this.dcContext = DcHelper.getContext(context);
     this.rpc = DcHelper.getRpc(context);
 
     supportRequestWindowFeature(WindowCompat.FEATURE_ACTION_BAR_OVERLAY);
@@ -237,34 +240,17 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       }
     });
 
-    getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
-        @Override
-        public void handleOnBackPressed() {
-            if (container.isInputOpen()) {
-                container.hideCurrentInput(composeText);
-            } else {
-                handleReturnToConversationList();
-            }
-        }
-    });
-
-    setDcEventListener();
-    handleRelaying();
-  }
-
-  private void setDcEventListener() {
     DcEventCenter eventCenter = DcHelper.getEventCenter(this);
-    // first cleanup in case it was already registered for other chat
-    eventCenter.removeObservers(this);
-
-    eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this);
-    eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED, this);
-    eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this);
+    eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this);
+    eventCenter.addObserver(DcContext.DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED, this);
+    eventCenter.addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this);
 
     if (!isMultiUser()) {
-      eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_INCOMING_MSG, this);
-      eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_MSG_READ, this);
+      eventCenter.addObserver(DcContext.DC_EVENT_INCOMING_MSG, this);
+      eventCenter.addObserver(DcContext.DC_EVENT_MSG_READ, this);
     }
+
+    handleRelaying();
   }
 
   @Override
@@ -290,7 +276,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       }
     });
 
-    setDcEventListener(); // reset event listener
     handleRelaying();
 
     if (fragment != null) {
@@ -317,13 +302,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     titleView.setTitle(glideRequests, dcChat);
 
-    try {
-      int accId = rpc.getSelectedAccountId();
-      DcHelper.getNotificationCenter(this).updateVisibleChat(accId, chatId);
-    } catch (RpcException e) {
-      Log.e(TAG, "rpc.getSelectedAccountId() failed", e);
-    }
-
+    DcHelper.getNotificationCenter(this).updateVisibleChat(dcContext.getAccountId(), chatId);
 
     attachmentManager.onResume();
   }
@@ -413,7 +392,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       break;
 
     case GROUP_EDIT:
-      dcChat = DcHelper.getContext(context).getChat(chatId);
+      dcChat = dcContext.getChat(chatId);
       titleView.setTitle(glideRequests, dcChat);
       break;
 
@@ -592,6 +571,15 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     return false;
   }
 
+  @Override
+  public void onBackPressed() {
+    if (container.isInputOpen()){
+      container.hideCurrentInput(composeText);
+    } else {
+      handleReturnToConversationList();
+    }
+  }
+
   @Override
   public void onKeyboardShown() {
     inputPanel.onKeyboardShown();
@@ -614,7 +602,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   //////// Event Handlers
 
   private void handleEphemeralMessages() {
-      DcContext dcContext = DcHelper.getContext(context);
       int preselected = dcContext.getChatEphemeralTimer(chatId);
       EphemeralMessagesDialog.show(this, preselected, duration -> {
         dcContext.setChatEphemeralTimer(chatId, (int) duration);
@@ -626,11 +613,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void handleReturnToConversationList(@Nullable Bundle extras) {
-    if (switchedProfile) { // force refreshing of chatlist
-      if (extras == null) extras = new Bundle();
-      extras.putInt(ConversationListFragment.RELOAD_LIST, 1);
-    }
-
     boolean archived = getIntent().getBooleanExtra(FROM_ARCHIVED_CHATS_EXTRA, false);
     Intent intent = new Intent(this, (archived ? ConversationListArchiveActivity.class : ConversationListActivity.class));
     intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -640,7 +622,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void handleMuteNotifications() {
-    DcContext dcContext = DcHelper.getContext(context);
     if(!dcChat.isMuted()) {
       MuteDialog.show(this, duration -> {
         dcContext.setChatMuteDuration(chatId, duration);
@@ -676,7 +657,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     AlertDialog dialog = new AlertDialog.Builder(this)
       .setMessage(getString(R.string.ask_leave_group))
       .setPositiveButton(leaveLabel, (d, which) -> {
-        DcHelper.getContext(context).removeContactFromChat(chatId, DcContact.DC_CONTACT_ID_SELF);
+        dcContext.removeContactFromChat(chatId, DcContact.DC_CONTACT_ID_SELF);
         Toast.makeText(this, getString(R.string.done), Toast.LENGTH_SHORT).show();
       })
       .setNegativeButton(R.string.cancel, null)
@@ -685,7 +666,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void handleArchiveChat() {
-    DcContext dcContext = DcHelper.getContext(context);
     int newVisibility = isArchived() ?
             DcChat.DC_CHAT_VISIBILITY_NORMAL : DcChat.DC_CHAT_VISIBILITY_ARCHIVED;
     dcContext.setChatVisibility(chatId, newVisibility);
@@ -701,7 +681,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     AlertDialog dialog = new AlertDialog.Builder(this)
         .setMessage(getResources().getString(R.string.ask_delete_named_chat, dcChat.getName()))
         .setPositiveButton(R.string.delete, (d, which) -> {
-          DcHelper.getContext(context).deleteChat(chatId);
+          dcContext.deleteChat(chatId);
           DirectShareUtil.clearShortcut(this, chatId);
           finish();
         })
@@ -731,7 +711,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void handleForwarding() {
-    DcContext dcContext = DcHelper.getContext(context);
     DcChat dcChat = dcContext.getChat(chatId);
     if (dcChat.isSelfTalk()) {
       SendRelayedMessageUtil.immediatelyRelay(this, chatId);
@@ -769,18 +748,18 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void handleSharing() {
-    ArrayList<Uri> uriList =  ShareUtil.getSharedUris(this);
-    int sharedContactId = ShareUtil.getSharedContactId(this);
+    ArrayList<Uri> uriList =  RelayUtil.getSharedUris(this);
+    int sharedContactId = RelayUtil.getSharedContactId(this);
     if (uriList.size() > 1) {
       askSendingFiles(uriList, () -> SendRelayedMessageUtil.immediatelyRelay(this, chatId));
     } else {
       if (sharedContactId != 0) {
         addAttachmentContactInfo(sharedContactId);
-      } else if (ShareUtil.getSharedHtml(this) != null || ShareUtil.getSharedSubject(this) != null || ("sticker".equals(ShareUtil.getSharedType(this)) && !uriList.isEmpty())) {
+      } else if (getSharedHtml(this) != null || getSharedSubject(this) != null || ("sticker".equals(getSharedType(this)) && !uriList.isEmpty())) {
         SendRelayedMessageUtil.immediatelyRelay(this, chatId);
       } else {
         Uri uri = uriList.isEmpty()? null : uriList.get(0);
-        DcHelper.getContext(context).setDraft(chatId, SendRelayedMessageUtil.createMessage(this, uri, ShareUtil.getSharedType(this), null, null, getSharedText(this)));
+        dcContext.setDraft(chatId, SendRelayedMessageUtil.createMessage(this, uri, getSharedType(this), null, null, getSharedText(this)));
       }
       initializeDraft();
     }
@@ -795,8 +774,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private ListenableFuture<Boolean> initializeDraft() {
     isEditing = false;
     final SettableFuture<Boolean> future = new SettableFuture<>();
-    DcMsg draft = DcHelper.getContext(context).getDraft(chatId);
-    final String sharedText = ShareUtil.getSharedText(this);
+    DcMsg draft = dcContext.getDraft(chatId);
+    final String sharedText = RelayUtil.getSharedText(this);
 
     if (!draft.isOk()) {
       if (TextUtils.isEmpty(sharedText)) {
@@ -810,8 +789,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       return future;
     }
 
-    inputPanel.setSubject(draft.getSubject());
-
     final String text = TextUtils.isEmpty(sharedText)? draft.getText() : sharedText;
     if(!text.isEmpty()) {
       composeText.setText(text);
@@ -906,18 +883,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     ImageButton quickCameraToggle = ViewUtil.findById(this, R.id.quick_camera_toggle);
 
-    if (!ViewUtil.isEdgeToEdgeSupported()) {
-      // since insets will not be applied, we need to set top padding to avoid drawing behind toolbar
-      try (TypedArray typedArray = obtainStyledAttributes(new int[]{android.R.attr.actionBarSize})) {
-        int paddingTop = typedArray.getDimensionPixelSize(0, 0);
-        container.setPadding(container.getPaddingLeft(), paddingTop, container.getPaddingRight() , container.getPaddingBottom());
-      }
-    }
-    // apply padding top to avoid drawing behind top bar
-    ViewUtil.applyWindowInsets(findViewById(R.id.fragment_content), false, true, false, false);
-    // apply padding to root to avoid collision with system bars
-    ViewUtil.applyWindowInsets(findViewById(R.id.root_layout), true, false, true, true);
-
     container.addOnKeyboardShownListener(this);
     container.addOnKeyboardHiddenListener(backgroundView);
     container.addOnKeyboardShownListener(backgroundView);
@@ -956,15 +921,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void initializeBackground() {
-    int accId;
-    try {
-      accId = rpc.getSelectedAccountId();
-    } catch (RpcException e) {
-      Log.e(TAG, "rpc.getSelectedAccountId() failed", e);
-      return;
-    }
-
-    String backgroundImagePath = Prefs.getBackgroundImagePath(this, accId);
+    String backgroundImagePath = Prefs.getBackgroundImagePath(this, dcContext.getAccountId());
     Drawable background;
     if(!backgroundImagePath.isEmpty()) {
       background = Drawable.createFromPath(backgroundImagePath);
@@ -983,6 +940,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     supportActionBar.setCustomView(R.layout.conversation_title_view);
     supportActionBar.setDisplayShowCustomEnabled(true);
     supportActionBar.setDisplayShowTitleEnabled(false);
+    supportActionBar.setElevation(0); // TODO: use custom toolbar instead
 
     Toolbar parent = (Toolbar) supportActionBar.getCustomView().getParent();
     parent.setPadding(0,0,0,0);
@@ -990,17 +948,17 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void initializeResources() {
-    int selectedAccId = DcHelper.getContext(context).getAccountId();
-    int accountId = getIntent().getIntExtra(ACCOUNT_ID_EXTRA, selectedAccId);
-    if (accountId != selectedAccId) {
-      switchedProfile = true;
+    int accountId = getIntent().getIntExtra(ACCOUNT_ID_EXTRA, dcContext.getAccountId());
+    if (accountId != dcContext.getAccountId()) {
       AccountManager.getInstance().switchAccount(context, accountId);
+      dcContext = context.dcContext;
+      fragment.dcContext = context.dcContext;
       initializeBackground();
     }
     chatId = getIntent().getIntExtra(CHAT_ID_EXTRA, -1);
     if(chatId == DcChat.DC_CHAT_NO_CHAT)
       throw new IllegalStateException("can't display a conversation for no chat.");
-    dcChat           = DcHelper.getContext(context).getChat(chatId);
+    dcChat           = dcContext.getChat(chatId);
     recipient        = new Recipient(this, dcChat);
     glideRequests    = GlideApp.with(this);
 
@@ -1012,12 +970,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     if (dcChat.canSend()) {
       composePanel.setVisibility(View.VISIBLE);
       attachmentManager.setHidden(false);
-      inputPanel.setSubjectVisible(!dcChat.isEncrypted());
     } else {
       composePanel.setVisibility(View.GONE);
       attachmentManager.setHidden(true);
       hideSoftKeyboard();
-      inputPanel.setSubjectVisible(false);
     }
   }
 
@@ -1067,11 +1023,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }
 
     try {
-      byte[] vcard = rpc.makeVcard(rpc.getSelectedAccountId(), Collections.singletonList(contactId)).getBytes();
+      byte[] vcard = rpc.makeVcard(dcContext.getAccountId(), Collections.singletonList(contactId)).getBytes();
       String mimeType = "application/octet-stream";
       setMedia(PersistentBlobProvider.getInstance().create(this, vcard, mimeType, "vcard.vcf"), MediaType.DOCUMENT);
     } catch (RpcException e) {
-      Log.e(TAG, "RPC failed", e);
+      Log.e(TAG, "makeVcard() failed", e);
     }
   }
 
@@ -1100,17 +1056,14 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     Optional<QuoteModel> quote = inputPanel.getQuote();
     boolean editing = isEditing;
-    final String subject = inputPanel.getSubject();
 
     // 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.
     if (action==ACTION_SEND_OUT) {
       composeText.setText("");
       inputPanel.clearQuote();
-      inputPanel.clearSubject();
     }
 
-    DcContext dcContext = DcHelper.getContext(context);
     Util.runOnAnyBackgroundThread(() -> {
       DcMsg msg = null;
       int recompress = 0;
@@ -1173,10 +1126,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         msg.setQuote(quote.get().getQuotedMsg());
       }
 
-      if (!subject.isEmpty() && msg != null) {
-        msg.setSubject(subject);
-      }
-
       if (action==ACTION_SEND_OUT) {
 
         // for WEBXDC, drafts are just sent out as is.
@@ -1243,12 +1192,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     if (refreshFragment) {
       fragment.reload(recipient, chatId);
-      try {
-        int accId = rpc.getSelectedAccountId();
-        DcHelper.getNotificationCenter(this).updateVisibleChat(accId, chatId);
-      } catch (RpcException e) {
-        Log.e(TAG, "rpc.getSelectedAccountId() failed", e);
-      }
+      DcHelper.getNotificationCenter(this).updateVisibleChat(dcContext.getAccountId(), chatId);
     }
 
     fragment.scrollToBottom();
@@ -1410,7 +1354,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     Optional<QuoteModel> quote = inputPanel.getQuote();
     inputPanel.clearQuote();
 
-    DcContext dcContext = DcHelper.getContext(context);
     DcMsg msg = new DcMsg(dcContext, DcMsg.DC_MSG_STICKER);
     if (quote.isPresent()) {
       msg.setQuote(quote.get().getQuotedMsg());
@@ -1532,7 +1475,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     if (isEditing) composeText.setText("");
     isEditing = false;
     // If you modify these lines you may also want to modify ConversationItem.setQuote():
-    Recipient author = new Recipient(this, DcHelper.getContext(context).getContact(msg.getFromId()));
+    Recipient author = new Recipient(this, dcContext.getContact(msg.getFromId()));
 
     SlideDeck slideDeck = new SlideDeck();
     if (msg.hasFile()) {
@@ -1555,7 +1498,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   @Override
   public void handleEditMessage(DcMsg msg) {
     isEditing = true;
-    Recipient author = new Recipient(this, DcHelper.getContext(context).getContact(msg.getFromId()));
+    Recipient author = new Recipient(this, dcContext.getContact(msg.getFromId()));
 
     SlideDeck slideDeck = new SlideDeck();
     String text = msg.getSummarytext(500);
@@ -1580,9 +1523,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   @Override
   public void handleEvent(@NonNull DcEvent event) {
-    DcContext dcContext = DcHelper.getContext(context);
-    if (event.getAccountId() != dcContext.getAccountId()) return;
-
     int eventId = event.getId();
     if ((eventId == DcContext.DC_EVENT_CHAT_MODIFIED && event.getData1Int() == chatId)
      || (eventId == DcContext.DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED && event.getData1Int() == chatId)
@@ -1669,7 +1609,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }
 
     String normQuery = query.trim();
-    searchResult = DcHelper.getContext(context).searchMsgs(chatId, normQuery);
+    searchResult = dcContext.searchMsgs(chatId, normQuery);
 
     if(searchResult.length>0) {
       searchResultPosition = searchResult.length - 1;
@@ -1700,7 +1640,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     messageRequestBottomView.setVisibility(View.VISIBLE);
     messageRequestBottomView.setAcceptOnClickListener(v -> {
-      DcHelper.getContext(context).acceptChat(chatId);
+      dcContext.acceptChat(chatId);
       messageRequestBottomView.setVisibility(View.GONE);
       composePanel.setVisibility(View.VISIBLE);
     });
@@ -1718,7 +1658,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         // avoid showing compose panel on receiving DC_EVENT_CONTACTS_CHANGED for the chat that is no longer a request after blocking
         DcHelper.getEventCenter(this).removeObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this);
 
-        DcHelper.getContext(context).blockChat(chatId);
+        dcContext.blockChat(chatId);
         Bundle extras = new Bundle();
         extras.putInt(ConversationListFragment.RELOAD_LIST, 1);
         handleReturnToConversationList(extras);

src/main/java/org/thoughtcrime/securesms/ConversationFragment.java

@@ -17,7 +17,7 @@
 package org.thoughtcrime.securesms;
 
 import static com.b44t.messenger.DcContact.DC_CONTACT_ID_SELF;
-import static org.thoughtcrime.securesms.util.ShareUtil.setForwardingMessageIds;
+import static org.thoughtcrime.securesms.util.RelayUtil.setForwardingMessageIds;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -60,15 +60,14 @@ import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.reactions.AddReactionView;
 import org.thoughtcrime.securesms.reactions.ReactionsDetailsFragment;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.relay.EditRelayActivity;
 import org.thoughtcrime.securesms.util.AccessibilityUtil;
 import org.thoughtcrime.securesms.util.Debouncer;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.ConversationAdaptiveActionsToolbar;
+import org.thoughtcrime.securesms.calls.CallUtil;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -76,9 +75,6 @@ import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import chat.delta.rpc.Rpc;
-import chat.delta.rpc.RpcException;
-
 @SuppressLint("StaticFieldLeak")
 public class ConversationFragment extends MessageSelectorFragment
 {
@@ -107,12 +103,11 @@ public class ConversationFragment extends MessageSelectorFragment
 
     public boolean isPaused;
     private Debouncer markseenDebouncer;
-    private Rpc rpc;
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        rpc = DcHelper.getRpc(getContext());
+        this.dcContext = DcHelper.getContext(getContext());
 
         DcEventCenter eventCenter = DcHelper.getEventCenter(getContext());
         eventCenter.addObserver(DcContext.DC_EVENT_INCOMING_MSG, this);
@@ -213,13 +208,8 @@ public class ConversationFragment extends MessageSelectorFragment
     @Override
     public void onResume() {
         super.onResume();
-        Util.runOnBackground(() -> {
-          try {
-            rpc.marknoticedChat(rpc.getSelectedAccountId(), (int) chatId);
-          } catch (RpcException e) {
-              Log.e(TAG, "RPC error", e);
-          }
-        });
+
+        Util.runOnBackground(() -> dcContext.marknoticedChat((int) chatId));
         if (list.getAdapter() != null) {
             list.getAdapter().notifyDataSetChanged();
         }
@@ -298,12 +288,7 @@ public class ConversationFragment extends MessageSelectorFragment
             dateDecoration = new StickyHeaderDecoration(adapter, false, false);
             list.addItemDecoration(dateDecoration);
 
-            int freshMsgs = 0;
-            try {
-              freshMsgs = rpc.getFreshMsgCnt(rpc.getSelectedAccountId(), (int) chatId);
-            } catch (RpcException e) {
-              Log.e(TAG, "RPC error", e);
-            }
+            int freshMsgs = dcContext.getFreshMsgCount((int) chatId);
             SetStartingPositionLinearLayoutManager layoutManager = (SetStartingPositionLinearLayoutManager) list.getLayoutManager();
             if (startingPosition > -1) {
                 layoutManager.setStartingPosition(startingPosition);
@@ -463,7 +448,6 @@ public class ConversationFragment extends MessageSelectorFragment
 
         StringBuilder result = new StringBuilder();
 
-        DcContext dcContext = DcHelper.getContext(getContext());
         DcMsg prevMsg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
         for (DcMsg msg : dcMsgsList) {
             if (result.length() > 0) {
@@ -492,13 +476,9 @@ public class ConversationFragment extends MessageSelectorFragment
     private void handleForwardMessage(final Set<DcMsg> messageRecords) {
         Intent composeIntent = new Intent();
         int[] msgIds = DcMsg.msgSetToIds(messageRecords);
-        try {
-          setForwardingMessageIds(composeIntent, msgIds, rpc.getSelectedAccountId());
-          ConversationListRelayingActivity.start(this, composeIntent);
-          getActivity().overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
-        } catch (RpcException e) {
-          Log.e(TAG, "RPC error", e);
-        }
+        setForwardingMessageIds(composeIntent, msgIds);
+        ConversationListRelayingActivity.start(this, composeIntent);
+        getActivity().overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
     }
 
     @SuppressLint("RestrictedApi")
@@ -524,7 +504,6 @@ public class ConversationFragment extends MessageSelectorFragment
     private void handleReplyMessagePrivately(final DcMsg msg) {
 
         if (getActivity() != null) {
-            DcContext dcContext = DcHelper.getContext(getActivity());
             int privateChatId = dcContext.createChatByContactId(msg.getFromId());
             DcMsg replyMsg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
             replyMsg.setQuote(msg);
@@ -541,14 +520,10 @@ public class ConversationFragment extends MessageSelectorFragment
 
     private void handleToggleSave(final Set<DcMsg> messageRecords) {
         DcMsg msg = getSelectedMessageRecord(messageRecords);
-        try {
-          if (msg.getSavedMsgId() != 0) {
-            rpc.deleteMessages(rpc.getSelectedAccountId(), Collections.singletonList(msg.getSavedMsgId()));
-          } else {
-            rpc.saveMsgs(rpc.getSelectedAccountId(), Collections.singletonList(msg.getId()));
-          }
-        } catch (RpcException e) {
-          Log.e(TAG, "RPC error", e);
+        if (msg.getSavedMsgId() != 0) {
+          dcContext.deleteMsgs(new int[]{msg.getSavedMsgId()});
+        } else {
+          dcContext.saveMsgs(new int[]{msg.getId()});
         }
     }
 
@@ -618,7 +593,7 @@ public class ConversationFragment extends MessageSelectorFragment
     }
 
     private void updateLocationButton() {
-        floatingLocationButton.setVisibility(DcHelper.getContext(getContext()).isSendingLocationsToChat((int) chatId)? View.VISIBLE : View.GONE);
+        floatingLocationButton.setVisibility(dcContext.isSendingLocationsToChat((int) chatId)? View.VISIBLE : View.GONE);
     }
 
     private void scrollAndHighlight(final int pos, boolean smooth) {
@@ -754,20 +729,16 @@ public class ConversationFragment extends MessageSelectorFragment
             return;
         }
 
-        ArrayList<Integer> ids = new ArrayList<>(lastPos - firstPos + 1);
+        int[] ids = new int[lastPos - firstPos + 1];
+        int index = 0;
         for(int pos = firstPos; pos <= lastPos; pos++) {
             DcMsg message = ((ConversationAdapter) list.getAdapter()).getMsg(pos);
             if (message.getFromId() != DC_CONTACT_ID_SELF) {
-                ids.add(message.getId());
+                ids[index] = message.getId();
+                index++;
             }
         }
-        Util.runOnAnyBackgroundThread(() -> {
-          try {
-            rpc.markseenMsgs(rpc.getSelectedAccountId(), ids);
-          } catch (RpcException e) {
-            Log.e(TAG, "RPC error", e);
-          }
-        });
+        Util.runOnAnyBackgroundThread(() -> dcContext.markseenMsgs(ids));
     }
 
     private class ConversationFragmentItemClickListener implements ItemClickListener {
@@ -792,9 +763,6 @@ public class ConversationFragment extends MessageSelectorFragment
             else if(DozeReminder.isDozeReminderMsg(getContext(), messageRecord)) {
                 DozeReminder.dozeReminderTapped(getContext());
             }
-            else if(StatsSending.isStatsSendingDeviceMsg(getContext(), messageRecord)) {
-                StatsSending.statsDeviceMsgTapped(getActivity());
-            }
             else if(messageRecord.getInfoType() == DcMsg.DC_INFO_WEBXDC_INFO_MESSAGE) {
                 if (messageRecord.getParent() != null) {
                     // if the parent webxdc message still exists
@@ -812,14 +780,12 @@ public class ConversationFragment extends MessageSelectorFragment
                     startActivity(intent);
                 }
                 else {
-                    String self_mail = DcHelper.getContext(getContext()).getConfig("configured_mail_user");
+                    String self_mail = dcContext.getConfig("configured_mail_user");
                     if (self_mail != null && !self_mail.isEmpty()
                       && messageRecord.getText().contains(self_mail)
                       && getListAdapter().getChat().isDeviceTalk()) {
                       // This is a device message informing the user that the password is wrong
-                      Intent intent = new Intent(getActivity(), EditRelayActivity.class);
-                      intent.putExtra(EditRelayActivity.EXTRA_ADDR, self_mail);
-                      startActivity(intent);
+                      startActivity(new Intent(getActivity(), EditTransportActivity.class));
                     }
                 }
             }
@@ -851,7 +817,7 @@ public class ConversationFragment extends MessageSelectorFragment
             if (foreignChatId != 0 && foreignChatId != chatId) {
                 Intent intent = new Intent(getActivity(), ConversationActivity.class);
                 intent.putExtra(ConversationActivity.CHAT_ID_EXTRA, foreignChatId);
-                int start = DcMsg.getMessagePosition(original, DcHelper.getContext(getContext()));
+                int start = DcMsg.getMessagePosition(original, dcContext);
                 intent.putExtra(ConversationActivity.STARTING_POSITION_EXTRA, start);
                 intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 ((ConversationActivity) getActivity()).hideSoftKeyboard();
@@ -867,7 +833,7 @@ public class ConversationFragment extends MessageSelectorFragment
 
         @Override
         public void onJumpToOriginalClicked(DcMsg messageRecord) {
-            jumpToOriginal(DcHelper.getContext(getContext()).getMsg(messageRecord.getOriginalMsgId()));
+            jumpToOriginal(dcContext.getMsg(messageRecord.getOriginalMsgId()));
         }
 
         @Override
@@ -886,7 +852,7 @@ public class ConversationFragment extends MessageSelectorFragment
 
       @Override
       public void onDownloadClicked(DcMsg messageRecord) {
-        DcHelper.getContext(getContext()).downloadFullMsg(messageRecord.getId());
+        dcContext.downloadFullMsg(messageRecord.getId());
       }
 
       @Override

src/main/java/org/thoughtcrime/securesms/ConversationItem.java

@@ -411,11 +411,8 @@ public class ConversationItem extends BaseConversationItem
     bodyText.setClickable(false);
     bodyText.setFocusable(false);
 
-    String subject = messageRecord.getSubject();
     String text = messageRecord.getText();
 
-    if (!subject.isEmpty() && messageRecord.isOutgoing() && !messageRecord.isSecure()) text = subject + "\n\n" + text;
-
     if (messageRecord.getType() == DcMsg.DC_MSG_CALL || text.isEmpty()) {
       bodyText.setVisibility(View.GONE);
     }

src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java

@@ -16,19 +16,19 @@
  */
 package org.thoughtcrime.securesms;
 
+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_PROXY_ENABLED;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_URL;
-import static org.thoughtcrime.securesms.util.ShareUtil.acquireRelayMessageContent;
-import static org.thoughtcrime.securesms.util.ShareUtil.getDirectSharingChatId;
-import static org.thoughtcrime.securesms.util.ShareUtil.getSharedTitle;
-import static org.thoughtcrime.securesms.util.ShareUtil.isDirectSharing;
-import static org.thoughtcrime.securesms.util.ShareUtil.isForwarding;
-import static org.thoughtcrime.securesms.util.ShareUtil.getForwardedMessageAccountId;
-import static org.thoughtcrime.securesms.util.ShareUtil.isRelayingMessageContent;
-import static org.thoughtcrime.securesms.util.ShareUtil.resetRelayingMessageContent;
+import static org.thoughtcrime.securesms.util.RelayUtil.acquireRelayMessageContent;
+import static org.thoughtcrime.securesms.util.RelayUtil.getDirectSharingChatId;
+import static org.thoughtcrime.securesms.util.RelayUtil.getSharedTitle;
+import static org.thoughtcrime.securesms.util.RelayUtil.isDirectSharing;
+import static org.thoughtcrime.securesms.util.RelayUtil.isForwarding;
+import static org.thoughtcrime.securesms.util.RelayUtil.isRelayingMessageContent;
+import static org.thoughtcrime.securesms.util.RelayUtil.resetRelayingMessageContent;
 
 import android.Manifest;
-import android.app.Activity;
 import android.content.Intent;
 import android.content.res.TypedArray;
 import android.graphics.Color;
@@ -46,7 +46,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
@@ -77,15 +76,12 @@ import org.thoughtcrime.securesms.search.SearchFragment;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Prefs;
-import org.thoughtcrime.securesms.util.ScreenLockUtil;
-import org.thoughtcrime.securesms.util.ShareUtil;
+import org.thoughtcrime.securesms.util.RelayUtil;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
 import org.thoughtcrime.securesms.util.SendRelayedMessageUtil;
 import org.thoughtcrime.securesms.util.StorageUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
-import chat.delta.rpc.types.SecurejoinSource;
-import chat.delta.rpc.types.SecurejoinUiPath;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -99,7 +95,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";
-  private static final int REQUEST_CODE_CONFIRM_CREDENTIALS_DELETE_PROFILE = ScreenLockUtil.REQUEST_CODE_CONFIRM_CREDENTIALS+1;
 
   private ConversationListFragment conversationListFragment;
   public TextView                  title;
@@ -111,11 +106,6 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
   private ViewGroup                fragmentContainer;
   private ViewGroup                selfAvatarContainer;
 
-  /** used to store temporarily scanned QR to pass it back to QrCodeHandler when ScreenLockUtil is used */
-  private String qrData = null;
-  /** used to store temporarily profile ID to delete after authorization is granted via ScreenLockUtil */
-  private int deleteProfileId = 0;
-
   @Override
   protected void onPreCreate() {
     dynamicTheme = new DynamicNoActionBarTheme();
@@ -124,9 +114,36 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
 
   @Override
   protected void onCreate(Bundle icicle, boolean ready) {
-    addDeviceMessages(getIntent().getBooleanExtra(FROM_WELCOME, false));
-    if (getIntent().getIntExtra(ACCOUNT_ID_EXTRA, -1) <= 0) {
-      getIntent().putExtra(ACCOUNT_ID_EXTRA, DcHelper.getContext(this).getAccountId());
+    // update messages - for new messages, do not reuse or modify strings but create new ones.
+    // it is not needed to keep all past update messages, however, when deleted, also the strings should be deleted.
+    try {
+      DcContext dcContext = DcHelper.getContext(this);
+      final String deviceMsgLabel = "update_2_25_0_android-b";
+      if (!dcContext.wasDeviceMsgEverAdded(deviceMsgLabel)) {
+        DcMsg msg = null;
+        if (!getIntent().getBooleanExtra(FROM_WELCOME, false)) {
+          msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
+
+          // InputStream inputStream = getResources().getAssets().open("device-messages/green-checkmark.jpg");
+          // String outputFile = DcHelper.getBlobdirFile(dcContext, "green-checkmark", ".jpg");
+          // Util.copy(inputStream, new FileOutputStream(outputFile));
+          // msg.setFile(outputFile, "image/jpeg");
+
+          msg.setText(getString(R.string.update_2_25, "https://i.delta.chat/#0A45953086F0C166D3BAF1D4BB2025496E4C2704&x=MVPi07rQBEmHO4FRb3brpwDe&j=n8mkKqu42WAKKUCx1bQOVh23&s=RxuXoa0vhvTs0QLsWM45Ues0&a=adb%40arcanechat.me&n=adb&b=ArcaneChat+Channel", "https://arcanechat.me/#contribute"));
+        }
+        dcContext.addDeviceMsg(deviceMsgLabel, msg);
+
+        if (Prefs.getStringPreference(this, Prefs.LAST_DEVICE_MSG_LABEL, "").equals(deviceMsgLabel)) {
+          int deviceChatId = dcContext.getChatIdByContactId(DcContact.DC_CONTACT_ID_DEVICE);
+          if (deviceChatId != 0) {
+            dcContext.marknoticedChat(deviceChatId);
+          }
+        }
+        Prefs.setStringPreference(this, Prefs.LAST_DEVICE_MSG_LABEL, deviceMsgLabel);
+      }
+
+    } catch(Exception e) {
+      e.printStackTrace();
     }
 
     // create view
@@ -142,49 +159,18 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     searchAction             = findViewById(R.id.search_action);
     fragmentContainer        = findViewById(R.id.fragment_container);
 
-    // add margin to avoid content hidden behind system bars
-    ViewUtil.applyWindowInsetsAsMargin(searchToolbar, true, true, true, false);
-
     Bundle bundle = new Bundle();
     conversationListFragment = initFragment(R.id.fragment_container, new ConversationListFragment(), bundle);
 
     initializeSearchListener();
 
-    getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
-      @Override
-      public void handleOnBackPressed() {
-        if (searchToolbar.isVisible()) {
-          searchToolbar.collapse();
-        } else {
-          Activity activity = ConversationListActivity.this;
-          if (isRelayingMessageContent(activity)) {
-            int selectedAccId = DcHelper.getContext(activity).getAccountId();
-            int initialAccId = getIntent().getIntExtra(ACCOUNT_ID_EXTRA, selectedAccId);
-            if (initialAccId != selectedAccId) {
-              // allowing to go back is dangerous, it could be activity on previously selected account,
-              // instead of figuring out account rollback in onResume in each activity (conversation, gallery, media preview, webxdc, etc.)
-              // just clear the back stack and stay in newly selected account
-              finishAffinity();
-              startActivity(new Intent(activity, ConversationListActivity.class));
-              return;
-            } else {
-              handleResetRelaying();
-            }
-          }
-
-          setEnabled(false);
-          getOnBackPressedDispatcher().onBackPressed();
-        }
-      }
-    });
-
     TooltipCompat.setTooltipText(searchAction, getText(R.string.search_explain));
 
     TooltipCompat.setTooltipText(selfAvatar, getText(R.string.switch_account));
-    selfAvatar.setOnClickListener(v -> AccountManager.getInstance().showSwitchAccountMenu(this, false));
+    selfAvatar.setOnClickListener(v -> AccountManager.getInstance().showSwitchAccountMenu(this));
     findViewById(R.id.avatar_and_title).setOnClickListener(v -> {
       if (!isRelayingMessageContent(this)) {
-        AccountManager.getInstance().showSwitchAccountMenu(this, false);
+        AccountManager.getInstance().showSwitchAccountMenu(this);
       }
     });
 
@@ -259,29 +245,24 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     }
     super.onNewIntent(intent);
     setIntent(intent);
-    if (getIntent().getIntExtra(ACCOUNT_ID_EXTRA, -1) <= 0) {
-      getIntent().putExtra(ACCOUNT_ID_EXTRA, DcHelper.getContext(this).getAccountId());
-    }
     refresh();
     conversationListFragment.onNewIntent();
     invalidateOptionsMenu();
   }
 
   private void refresh() {
-    int selectedAccId = DcHelper.getContext(this).getAccountId();
-    int accountId = getIntent().getIntExtra(ACCOUNT_ID_EXTRA, selectedAccId);
+    DcContext dcContext = DcHelper.getContext(this);
+    int accountId = getIntent().getIntExtra(ACCOUNT_ID_EXTRA, dcContext.getAccountId());
     if (getIntent().getBooleanExtra(CLEAR_NOTIFICATIONS, false)) {
       DcHelper.getNotificationCenter(this).removeAllNotifications(accountId);
     }
-    if (accountId != selectedAccId) {
-      AccountManager.getInstance().switchAccount(this, accountId);
-      onProfileSwitched(accountId);
-    } else {
-      refreshAvatar();
-      refreshUnreadIndicator();
-      refreshTitle();
+    if (accountId != dcContext.getAccountId()) {
+      AccountManager.getInstance().switchAccountAndStartActivity(this, accountId);
     }
 
+    refreshAvatar();
+    refreshUnreadIndicator();
+    refreshTitle();
     handleOpenpgp4fpr();
     if (isDirectSharing(this)) {
       openConversation(getDirectSharingChatId(this), -1);
@@ -379,7 +360,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     if (isRelayingMessageContent(this)) {
       inflater.inflate(R.menu.forwarding_menu, menu);
       menu.findItem(R.id.menu_export_attachment).setVisible(
-        ShareUtil.isFromWebxdc(this) && ShareUtil.getSharedUris(this).size() == 1
+        RelayUtil.isFromWebxdc(this) && RelayUtil.getSharedUris(this).size() == 1
       );
     } else {
       inflater.inflate(R.menu.text_secure_normal, menu);
@@ -459,16 +440,13 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
       startActivity(new Intent(this, ProxySettingsActivity.class));
       return true;
     } else if (itemId == android.R.id.home) {
-      getOnBackPressedDispatcher().onBackPressed();
+      onBackPressed();
       return true;
     } else if (itemId == R.id.menu_all_media) {
       startActivity(new Intent(this, AllMediaActivity.class));
       return true;
     } else if (itemId == R.id.menu_export_attachment) {
       handleSaveAttachment();
-    } else if (itemId == R.id.menu_switch_account) {
-      AccountManager.getInstance().showSwitchAccountMenu(this, true);
-      return true;
     }
 
     return false;
@@ -492,7 +470,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
   }
 
   private void performSave() {
-    ArrayList<Uri> uriList =  ShareUtil.getSharedUris(this);
+    ArrayList<Uri> uriList =  RelayUtil.getSharedUris(this);
     Uri uri = uriList.get(0);
     String mimeType = PersistentBlobProvider.getMimeType(this, uri);
     String fileName = PersistentBlobProvider.getFileName(this, uri);
@@ -501,7 +479,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     };
     SaveAttachmentTask saveTask = new SaveAttachmentTask(this);
     saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, attachments);
-    getOnBackPressedDispatcher().onBackPressed();
+    onBackPressed();
   }
 
   private void handleOpenpgp4fpr() {
@@ -514,7 +492,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
 
       if (uri.getScheme().equalsIgnoreCase(OPENPGP4FPR) || Util.isInviteURL(uri)) {
         QrCodeHandler qrCodeHandler = new QrCodeHandler(this);
-        qrCodeHandler.handleOnlySecureJoinQr(uri.toString(), SecurejoinSource.ExternalLink, null);
+        qrCodeHandler.handleQrData(uri.toString());
       }
     }
   }
@@ -536,17 +514,15 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     searchToolbar.clearFocus();
 
     final DcContext dcContext = DcHelper.getContext(this);
-    int fwdAccId = getForwardedMessageAccountId(this);
-    if (fwdAccId == dcContext.getAccountId() && dcContext.getChat(chatId).isSelfTalk()) {
+    if (isForwarding(this) && dcContext.getChat(chatId).isSelfTalk()) {
       SendRelayedMessageUtil.immediatelyRelay(this, chatId);
       Toast.makeText(this, DynamicTheme.getCheckmarkEmoji(this) + " " + getString(R.string.saved), Toast.LENGTH_SHORT).show();
       handleResetRelaying();
       finish();
     } else {
       Intent intent = new Intent(this, ConversationActivity.class);
-      intent.putExtra(ConversationActivity.ACCOUNT_ID_EXTRA, dcContext.getAccountId());
-      intent.putExtra(ConversationActivity.CHAT_ID_EXTRA, chatId);
-      intent.putExtra(ConversationActivity.STARTING_POSITION_EXTRA, startingPosition);
+      intent.putExtra(CHAT_ID_EXTRA, chatId);
+      intent.putExtra(STARTING_POSITION_EXTRA, startingPosition);
       if (isRelayingMessageContent(this)) {
         acquireRelayMessageContent(this, intent);
       }
@@ -566,6 +542,15 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
   }
 
+  @Override
+  public void onBackPressed() {
+    if (searchToolbar.isVisible()) searchToolbar.collapse();
+    else if (isRelayingMessageContent(this)) {
+      handleResetRelaying();
+      finish();
+    } else super.onBackPressed();
+  }
+
   private void createChat() {
     Intent intent = new Intent(this, NewConversationActivity.class);
     if (isRelayingMessageContent(this)) {
@@ -582,102 +567,14 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     startActivity(Intent.createChooser(intent, getString(R.string.chat_share_with_title)));
   }
 
-  private void addDeviceMessages(boolean fromWelcome) {
-    // update messages - for new messages, do not reuse or modify strings but create new ones.
-    // it is not needed to keep all past update messages, however, when deleted, also the strings should be deleted.
-    try {
-      DcContext dcContext = DcHelper.getContext(this);
-      final String deviceMsgLabel = "update_2_33_1_android";
-      if (!dcContext.wasDeviceMsgEverAdded(deviceMsgLabel)) {
-        DcMsg msg = null;
-        if (!getIntent().getBooleanExtra(FROM_WELCOME, false)) {
-          msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
-
-          // InputStream inputStream = getResources().getAssets().open("device-messages/green-checkmark.jpg");
-          // String outputFile = DcHelper.getBlobdirFile(dcContext, "green-checkmark", ".jpg");
-          // Util.copy(inputStream, new FileOutputStream(outputFile));
-          // msg.setFile(outputFile, "image/jpeg");
-
-          msg.setText(getString(R.string.update_2_33, "https://arcanechat.me/#contribute"));
-        }
-        dcContext.addDeviceMsg(deviceMsgLabel, msg);
-
-        if (Prefs.getStringPreference(this, Prefs.LAST_DEVICE_MSG_LABEL, "").equals(deviceMsgLabel)) {
-          int deviceChatId = dcContext.getChatIdByContactId(DcContact.DC_CONTACT_ID_DEVICE);
-          if (deviceChatId != 0) {
-            dcContext.marknoticedChat(deviceChatId);
-          }
-        }
-        Prefs.setStringPreference(this, Prefs.LAST_DEVICE_MSG_LABEL, deviceMsgLabel);
-      }
-
-    } catch(Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  public void onProfileSwitched(int profileId) {
-    addDeviceMessages(false);
-    refreshAvatar();
-    refreshUnreadIndicator();
-    refreshTitle();
-    conversationListFragment.loadChatlist();
-  }
-
-  public void onDeleteProfile(int profileId) {
-    deleteProfileId = profileId;
-    boolean result = ScreenLockUtil.applyScreenLock(this, getString(R.string.delete_account), getString(R.string.enter_system_secret_to_continue), REQUEST_CODE_CONFIRM_CREDENTIALS_DELETE_PROFILE);
-    if (!result) {
-      deleteProfile(profileId);
-    }
-  }
-
-  private void deleteProfile(int profileId) {
-    DcAccounts accounts = DcHelper.getAccounts(this);
-    boolean selected = profileId == accounts.getSelectedAccount().getAccountId();
-    DcHelper.getNotificationCenter(this).removeAllNotifications(profileId);
-    accounts.removeAccount(profileId);
-    if (selected) {
-      DcContext selAcc = accounts.getSelectedAccount();
-      if (selAcc.isOk()) {
-        AccountManager.getInstance().switchAccount(this, selAcc.getAccountId());
-        onProfileSwitched(selAcc.getAccountId());
-      } else {
-        AccountManager.getInstance().switchAccountAndStartActivity(this, 0);
-      }
-    } else {
-      AccountManager.getInstance().showSwitchAccountMenu(this, false);
-    }
-
-    // title update needed to show "Delta Chat" in case there is only one profile left
-    refreshTitle();
-  }
-
   @Override
   protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     super.onActivityResult(requestCode, resultCode, data);
-    if (resultCode != RESULT_OK) return;
-
-    QrCodeHandler qrCodeHandler = new QrCodeHandler(this);
     switch (requestCode) {
       case IntentIntegrator.REQUEST_CODE:
-        IntentResult scanResult = IntentIntegrator.parseActivityResult(resultCode, data);
-        qrData = scanResult.getContents();
-        qrCodeHandler.handleQrData(qrData, SecurejoinSource.Scan, SecurejoinUiPath.QrIcon);
-        break;
-      case ScreenLockUtil.REQUEST_CODE_CONFIRM_CREDENTIALS:
-        // QrCodeHandler requested user authorization before adding a relay
-        // and it was granted, so proceed to add the relay
-        if (qrData != null) {
-          qrCodeHandler.addRelay(qrData);
-          qrData = null;
-        }
-        break;
-      case REQUEST_CODE_CONFIRM_CREDENTIALS_DELETE_PROFILE:
-        if (deleteProfileId != 0) {
-          deleteProfile(deleteProfileId);
-          deleteProfileId = 0;
-        }
+        IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
+        QrCodeHandler qrCodeHandler = new QrCodeHandler(this);
+        qrCodeHandler.onScanPerformed(scanResult);
         break;
       default:
         break;

src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java

@@ -2,9 +2,9 @@ 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.ShareUtil.acquireRelayMessageContent;
-import static org.thoughtcrime.securesms.util.ShareUtil.isRelayingMessageContent;
-import static org.thoughtcrime.securesms.util.ShareUtil.isSharing;
+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;
@@ -12,8 +12,6 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import androidx.activity.OnBackPressedCallback;
-
 import com.b44t.messenger.DcChat;
 
 import org.thoughtcrime.securesms.connect.DcHelper;
@@ -25,6 +23,7 @@ public class ConversationListArchiveActivity extends PassphraseRequiredActionBar
   protected void onCreate(Bundle icicle, boolean ready) {
     setContentView(R.layout.activity_conversation_list_archive);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
     if (isRelayingMessageContent(this)) {
       getSupportActionBar().setTitle(isSharing(this) ? R.string.chat_share_with_title : R.string.forward_to);
       getSupportActionBar().setSubtitle(R.string.chat_archived_label);
@@ -35,21 +34,6 @@ public class ConversationListArchiveActivity extends PassphraseRequiredActionBar
     Bundle bundle = new Bundle();
     bundle.putBoolean(ConversationListFragment.ARCHIVE, true);
     initFragment(R.id.fragment, new ConversationListFragment(), bundle);
-
-    getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
-      @Override
-      public void handleOnBackPressed() {
-        if (!isRelayingMessageContent(ConversationListArchiveActivity.this)) {
-          // Load the ConversationListActivity in case it's not existent for some reason
-          Intent intent = new Intent(ConversationListArchiveActivity.this, ConversationListActivity.class);
-          intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-          startActivity(intent);
-        }
-
-        setEnabled(false);
-        getOnBackPressedDispatcher().onBackPressed();
-      }
-    });
   }
 
   @Override
@@ -80,7 +64,7 @@ public class ConversationListArchiveActivity extends PassphraseRequiredActionBar
 
     int itemId = item.getItemId();
     if (itemId == android.R.id.home) {
-      getOnBackPressedDispatcher().onBackPressed();
+      onBackPressed();
       return true;
     } else if (itemId == R.id.mark_as_read) {
       DcHelper.getContext(this).marknoticedChat(DcChat.DC_CHAT_ID_ARCHIVED_LINK);
@@ -90,6 +74,20 @@ public class ConversationListArchiveActivity extends PassphraseRequiredActionBar
     return false;
   }
 
+  @Override
+  public void onBackPressed() {
+    if (isRelayingMessageContent(this)) {
+      // Go back to the ConversationListRelayingActivity
+      super.onBackPressed();
+    } else {
+      // Load the ConversationListActivity in case it's not existent for some reason
+      Intent intent = new Intent(this, ConversationListActivity.class);
+      intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+      startActivity(intent);
+      finish();
+    }
+  }
+
   @Override
   public void onCreateConversation(int chatId) {
     Intent intent = new Intent(this, ConversationActivity.class);

src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java

@@ -48,7 +48,7 @@ import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.notifications.FcmReceiveService;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.Prefs;
-import org.thoughtcrime.securesms.util.ShareUtil;
+import org.thoughtcrime.securesms.util.RelayUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
@@ -108,9 +108,6 @@ public class ConversationListFragment extends BaseConversationListFragment
     emptyState   = ViewUtil.findById(view, R.id.empty_state);
     emptySearch  = ViewUtil.findById(view, R.id.empty_search);
 
-    // add padding to avoid content hidden behind system bars
-    ViewUtil.applyWindowInsets(list, true, archive, true, true);
-
     if (archive) {
       fab.setVisibility(View.GONE);
       TextView emptyTitle = ViewUtil.findById(view, R.id.empty_title);
@@ -118,8 +115,6 @@ public class ConversationListFragment extends BaseConversationListFragment
     } else {
       fab.setVisibility(View.VISIBLE);
     }
-    // Apply insets to prevent fab from being covered by system bars
-    ViewUtil.applyWindowInsetsAsMargin(fab);
 
     list.setHasFixedSize(true);
     list.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -260,11 +255,11 @@ public class ConversationListFragment extends BaseConversationListFragment
     });
   }
 
-  public void loadChatlist() {
+  private void loadChatlist() {
     int listflags = 0;
     if (archive) {
       listflags |= DcContext.DC_GCL_ARCHIVED_ONLY;
-    } else if (ShareUtil.isRelayingMessageContent(getActivity())) {
+    } else if (RelayUtil.isRelayingMessageContent(getActivity())) {
       listflags |= DcContext.DC_GCL_FOR_FORWARDING;
     } else {
       listflags |= DcContext.DC_GCL_ADD_ALLDONE_HINT;

src/main/java/org/thoughtcrime/securesms/ConversationListItem.java

@@ -124,6 +124,7 @@ public class ConversationListItem extends RelativeLayout
     this.msgId            = msgId;
 
     int state       = dcSummary.getState();
+    int unreadCount = thread.getUnreadCount();
 
     if (highlightSubstring != null) {
       this.fromView.setText(getHighlightedSpan(recipient.getName(), highlightSubstring));
@@ -150,7 +151,7 @@ public class ConversationListItem extends RelativeLayout
       thread.getVisibility()==DcChat.DC_CHAT_VISIBILITY_PINNED? R.drawable.ic_pinned_chatlist : 0, 0
     );
 
-    setStatusIcons(thread, state);
+    setStatusIcons(thread.getVisibility(), state, unreadCount, thread.isContactRequest(), thread.isMuted() || chatId == DcChat.DC_CHAT_ID_ARCHIVED_LINK);
     setBatchState(batchMode);
     setBgColor(thread);
 
@@ -239,14 +240,14 @@ public class ConversationListItem extends RelativeLayout
     return msgId;
   }
 
-  private void setStatusIcons(ThreadRecord thread, int state) {
-    if (thread.getVisibility() == DcChat.DC_CHAT_VISIBILITY_ARCHIVED)
+  private void setStatusIcons(int visibility, int state, int unreadCount, boolean isContactRequest, boolean isMuted) {
+    if (visibility==DcChat.DC_CHAT_VISIBILITY_ARCHIVED)
     {
       archivedBadgeView.setVisibility(View.VISIBLE);
-      requestBadgeView.setVisibility(thread.isContactRequest() ? View.VISIBLE : View.GONE);
+      requestBadgeView.setVisibility(isContactRequest ? View.VISIBLE : View.GONE);
       deliveryStatusIndicator.setNone();
     }
-    else if (thread.isContactRequest()) {
+    else if (isContactRequest) {
       requestBadgeView.setVisibility(View.VISIBLE);
       archivedBadgeView.setVisibility(View.GONE);
       deliveryStatusIndicator.setNone();
@@ -258,16 +259,14 @@ public class ConversationListItem extends RelativeLayout
 
       if (state == DcMsg.DC_STATE_OUT_FAILED) {
         deliveryStatusIndicator.setFailed();
-      } else if (state == DcMsg.DC_STATE_OUT_PREPARING) {
-        deliveryStatusIndicator.setPreparing();
-      } else if (state == DcMsg.DC_STATE_OUT_PENDING) {
-        deliveryStatusIndicator.setPending();
-      } else if (thread.isOutChannel()) {
-        deliveryStatusIndicator.setNone();
       } else if (state == DcMsg.DC_STATE_OUT_MDN_RCVD) {
         deliveryStatusIndicator.setRead();
       } else if (state == DcMsg.DC_STATE_OUT_DELIVERED) {
         deliveryStatusIndicator.setSent();
+      } else if (state == DcMsg.DC_STATE_OUT_PREPARING) {
+        deliveryStatusIndicator.setPreparing();
+      } else if (state == DcMsg.DC_STATE_OUT_PENDING) {
+        deliveryStatusIndicator.setPending();
       } else {
         deliveryStatusIndicator.setNone();
       }
@@ -279,12 +278,11 @@ public class ConversationListItem extends RelativeLayout
       }
     }
 
-    int unreadCount = thread.getUnreadCount();
-    if(unreadCount==0 || thread.isContactRequest()) {
+    if(unreadCount==0 || isContactRequest) {
       unreadIndicator.setVisibility(View.GONE);
     } else {
       final int color;
-      if(thread.isMuted() || chatId == DcChat.DC_CHAT_ID_ARCHIVED_LINK){
+      if(isMuted){
         color = getResources().getColor(ThemeUtil.isDarkTheme(getContext()) ? R.color.unread_count_muted_dark : R.color.unread_count_muted);
       } else {
         final TypedArray attrs = getContext().obtainStyledAttributes(new int[] {

src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java

@@ -21,7 +21,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.loader.app.LoaderManager;
 
@@ -53,6 +52,8 @@ public class CreateProfileActivity extends BaseActionBarActivity {
 
   private static final String TAG = CreateProfileActivity.class.getSimpleName();
 
+  public static final String FROM_WELCOME   = "from_welcome";
+
   private static final int REQUEST_CODE_AVATAR = 1;
 
   private InputAwareLayout       container;
@@ -60,6 +61,7 @@ public class CreateProfileActivity extends BaseActionBarActivity {
   private EditText               name;
   private EditText               statusView;
 
+  private boolean fromWelcome;
   private boolean avatarChanged;
   private boolean imageLoaded;
 
@@ -70,12 +72,14 @@ public class CreateProfileActivity extends BaseActionBarActivity {
   @Override
   public void onCreate(Bundle bundle) {
     super.onCreate(bundle);
+    this.fromWelcome  = getIntent().getBooleanExtra(FROM_WELCOME, false);
 
     setContentView(R.layout.profile_create_activity);
 
     getSupportActionBar().setTitle(R.string.pref_profile_info_headline);
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setDisplayHomeAsUpEnabled(!this.fromWelcome);
     getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
+    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
 
     attachmentManager = new AttachmentManager(this, () -> {});
     avatarChanged = false;
@@ -83,18 +87,6 @@ public class CreateProfileActivity extends BaseActionBarActivity {
     initializeProfileName();
     initializeProfileAvatar();
     initializeStatusText();
-
-    getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
-      @Override
-      public void handleOnBackPressed() {
-        if (container.isInputOpen()) {
-          container.hideCurrentInput(name);
-        } else {
-          setEnabled(false);
-          getOnBackPressedDispatcher().onBackPressed();
-        }
-      }
-    });
   }
 
   @Override
@@ -109,7 +101,7 @@ public class CreateProfileActivity extends BaseActionBarActivity {
     super.onOptionsItemSelected(item);
     int itemId = item.getItemId();
     if (itemId == android.R.id.home) {
-      getOnBackPressedDispatcher().onBackPressed();
+      onBackPressed();
       return true;
     } else if (itemId == R.id.menu_create_profile) {
       updateProfile();
@@ -118,6 +110,17 @@ public class CreateProfileActivity extends BaseActionBarActivity {
     return false;
   }
 
+  @Override
+  public void onBackPressed() {
+    if (container.isInputOpen()) {
+      container.hideCurrentInput(name);
+    } else if (fromWelcome) {
+      updateProfile();
+    } else {
+      super.onBackPressed();
+    }
+  }
+
   @Override
   public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
     Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
@@ -182,10 +185,13 @@ public class CreateProfileActivity extends BaseActionBarActivity {
     this.container    = ViewUtil.findById(this, R.id.container);
     this.statusView   = ViewUtil.findById(this, R.id.status_text);
 
-    // add padding to avoid content hidden behind system bars
-    ViewUtil.applyWindowInsets(container);
-
-    loginSuccessText.setVisibility(View.GONE);
+    if (fromWelcome) {
+      loginSuccessText.setText(R.string.set_name_and_avatar_explain);
+      ViewUtil.findById(this, R.id.status_text_layout).setVisibility(View.GONE);
+      ViewUtil.findById(this, R.id.information_label).setVisibility(View.GONE);
+    } else {
+      loginSuccessText.setVisibility(View.GONE);
+    }
   }
 
   private void initializeProfileName() {
@@ -252,6 +258,11 @@ public class CreateProfileActivity extends BaseActionBarActivity {
 
         if (result) {
           attachmentManager.cleanup();
+          if (fromWelcome) {
+            Intent intent = new Intent(getApplicationContext(), ConversationListActivity.class);
+            intent.putExtra(ConversationListActivity.FROM_WELCOME, true);
+            startActivity(intent);
+          }
           finish();
         } else        {
           Toast.makeText(CreateProfileActivity.this, R.string.error, Toast.LENGTH_LONG).show();

src/main/java/org/thoughtcrime/securesms/EditTransportActivity.java

@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.relay;
+package org.thoughtcrime.securesms;
 
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_ENABLED;
 import static org.thoughtcrime.securesms.connect.DcHelper.getContext;
@@ -10,7 +10,6 @@ import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.util.Patterns;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -33,15 +32,11 @@ import com.b44t.messenger.DcEvent;
 import com.b44t.messenger.DcProvider;
 import com.google.android.material.textfield.TextInputEditText;
 
-import org.thoughtcrime.securesms.BaseActionBarActivity;
-import org.thoughtcrime.securesms.ConversationListActivity;
-import org.thoughtcrime.securesms.LogViewActivity;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.WelcomeActivity;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.proxy.ProxySettingsActivity;
+import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.IntentUtils;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -55,7 +50,7 @@ import chat.delta.rpc.types.EnteredCertificateChecks;
 import chat.delta.rpc.types.EnteredLoginParam;
 import chat.delta.rpc.types.Socket;
 
-public class EditRelayActivity extends BaseActionBarActivity implements DcEventCenter.DcEventDelegate {
+public class EditTransportActivity extends BaseActionBarActivity implements DcEventCenter.DcEventDelegate {
 
     private enum VerificationType {
         EMAIL,
@@ -63,8 +58,7 @@ public class EditRelayActivity extends BaseActionBarActivity implements DcEventC
         PORT,
     }
 
-    private static final String TAG = EditRelayActivity.class.getSimpleName();
-    public final static String EXTRA_ADDR = "extra_addr";
+    private final DynamicTheme dynamicTheme    = new DynamicTheme();
 
     private TextInputEditText emailInput;
     private TextInputEditText passwordInput;
@@ -91,15 +85,12 @@ public class EditRelayActivity extends BaseActionBarActivity implements DcEventC
     @Override
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
+        dynamicTheme.onCreate(this);
         rpc = DcHelper.getRpc(this);
         accId = DcHelper.getContext(this).getAccountId();
 
         setContentView(R.layout.activity_edittransport);
 
-        // add padding to avoid content hidden behind system bars
-        ViewUtil.applyWindowInsets(findViewById(R.id.content_container));
-
-
         emailInput = findViewById(R.id.email_text);
         passwordInput = findViewById(R.id.password_text);
 
@@ -127,26 +118,11 @@ public class EditRelayActivity extends BaseActionBarActivity implements DcEventC
             startActivity(new Intent(this, ProxySettingsActivity.class));
         });
 
-        String addr = getIntent().getStringExtra(EXTRA_ADDR);
         EnteredLoginParam config = null;
         try {
             List<EnteredLoginParam> relays = rpc.listTransports(accId);
-            for (EnteredLoginParam relay : relays) {
-                if (addr != null && addr.equals(relay.addr)) {
-                    config = relay;
-                    break;
-                }
-            }
-            if (config == null && !relays.isEmpty()) {
-                Log.e(TAG, "Error got unknown address: " + addr);
-                finish();
-                return;
-            };
-        } catch (RpcException e) {
-            Log.e(TAG, "Error calling Rpc.listTransports()", e);
-            finish();
-            return;
-        }
+            if (!relays.isEmpty()) config = relays.get(0);
+        } catch (RpcException ignored) {}
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
@@ -155,6 +131,7 @@ public class EditRelayActivity extends BaseActionBarActivity implements DcEventC
             );
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
+            actionBar.setElevation(0); // TODO: use custom toolbar instead
         }
 
         if (config != null) emailInput.setEnabled(false);
@@ -238,6 +215,7 @@ public class EditRelayActivity extends BaseActionBarActivity implements DcEventC
     @Override
     public void onResume() {
         super.onResume();
+        dynamicTheme.onResume(this);
         proxySwitch.setChecked(DcHelper.getInt(this, CONFIG_PROXY_ENABLED) == 1);
     }
 

src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java

@@ -80,6 +80,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
     unencrypted = getIntent().getBooleanExtra(UNENCRYPTED, false);
     Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
     getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
+    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
 
     groupChatId = getIntent().getIntExtra(EDIT_GROUP_CHAT_ID, 0);
     attachmentManager = new AttachmentManager(this, () -> {});
@@ -142,14 +143,9 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
     groupName           = ViewUtil.findById(this, R.id.group_name);
     TextView chatHints  = ViewUtil.findById(this, R.id.chat_hints);
 
-    // add padding to avoid content hidden behind system bars
-    ViewUtil.applyWindowInsets(lv, false, false, false, true);
-    // apply padding to root to avoid collision with system bars
-    ViewUtil.applyWindowInsets(findViewById(R.id.root_layout), true, false, true, false);
-
     initializeAvatarView();
 
-    SelectedContactsAdapter adapter = new SelectedContactsAdapter(this, GlideApp.with(this), broadcast);
+    SelectedContactsAdapter adapter = new SelectedContactsAdapter(this, GlideApp.with(this), broadcast, unencrypted);
     adapter.setItemClickListener(this);
     lv.setAdapter(adapter);
 

src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java

@@ -25,6 +25,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
@@ -40,6 +41,7 @@ import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
 
 import org.thoughtcrime.securesms.components.AvatarSelector;
+import org.thoughtcrime.securesms.connect.AccountManager;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
@@ -49,14 +51,10 @@ import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.proxy.ProxySettingsActivity;
 import org.thoughtcrime.securesms.qr.RegistrationQrActivity;
-import org.thoughtcrime.securesms.relay.EditRelayActivity;
-import org.thoughtcrime.securesms.relay.RelayListActivity;
 import org.thoughtcrime.securesms.scribbles.ScribbleActivity;
 import org.thoughtcrime.securesms.util.IntentUtils;
 import org.thoughtcrime.securesms.util.Prefs;
-import org.thoughtcrime.securesms.util.TextUtil;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.ProgressDialog;
 
 import java.io.File;
@@ -75,6 +73,8 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
   private static final String INSTANCES_URL = "https://chatmail.at/relays";
   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";
   private static final int REQUEST_CODE_AVATAR = 1;
 
   private ImageView avatar;
@@ -104,21 +104,25 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
 
     Objects.requireNonNull(getSupportActionBar()).setTitle(R.string.onboarding_create_instant_account);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
 
-    boolean configured  = DcHelper.getContext(this).isConfigured() == 1;
-
-    if (configured) {
+    boolean fromWelcome  = getIntent().getBooleanExtra(FROM_WELCOME, false);
+    if (DcHelper.getContext(this).isConfigured() == 1) {
       // if account is configured it means we didn't come from Welcome screen nor from QR scanner,
-      // instead, user clicked a dcaccount:// URI directly, so we need to just offer to add a new relay
-      Uri uri = getIntent().getData();
-      if (uri != null) {
-        Intent intent = new Intent(this, RelayListActivity.class);
-        intent.putExtra(RelayListActivity.EXTRA_QR_DATA, uri.toString());
-        startActivity(intent);
-      }
-      finish();
-      return;
+      // instead, user clicked a dcaccount:// URI directly, so we need to switch to a new account:
+      AccountManager.getInstance().beginAccountCreation(this);
     }
+    getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(!fromWelcome) {
+      @Override
+      public void handleOnBackPressed() {
+        AccountManager accountManager = AccountManager.getInstance();
+        if (accountManager.canRollbackAccountCreation(InstantOnboardingActivity.this)) {
+          accountManager.rollbackAccountCreation(InstantOnboardingActivity.this);
+        } else {
+          finish();
+        }
+      }
+    });
 
     isDcLogin = false;
     providerHost = DEFAULT_CHATMAIL_HOST;
@@ -194,8 +198,10 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
       case IntentIntegrator.REQUEST_CODE:
         String qrRaw = data.getStringExtra(RegistrationQrActivity.QRDATA_EXTRA);
         if (qrRaw == null) {
-          IntentResult scanResult = IntentIntegrator.parseActivityResult(resultCode, data);
-          qrRaw = scanResult.getContents();
+          IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
+          if (scanResult != null && scanResult.getFormatName() != null) {
+            qrRaw = scanResult.getContents();
+          }
         }
         if (qrRaw != null) {
           setProviderFromQr(qrRaw);
@@ -226,6 +232,16 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
     Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
   }
 
+  @Override
+  public void onStart() {
+    super.onStart();
+    String accountQr = getIntent().getStringExtra(QR_ACCOUNT_EXTRA);
+    if (accountQr != null) {
+      getIntent().removeExtra(QR_ACCOUNT_EXTRA);
+      setProviderFromQr(accountQr);
+    }
+  }
+
   @Override
   protected void onPause() {
     super.onPause();
@@ -314,9 +330,6 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
     this.privacyPolicyBtn = findViewById(R.id.privacy_policy_button);
     this.signUpBtn        = findViewById(R.id.signup_button);
 
-    // add padding to avoid content hidden behind system bars
-    ViewUtil.applyWindowInsets(findViewById(R.id.container));
-
     privacyPolicyBtn.setOnClickListener(view -> {
       if (!isDcLogin) {
         IntentUtils.showInBrowser(this, "https://" + providerHost + "/privacy.html");
@@ -325,20 +338,22 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
 
     signUpBtn.setOnClickListener(view -> createProfile());
 
-    Button otherServerButton = findViewById(R.id.use_other_server);
-    otherServerButton.setText(
-      TextUtil.markAsExternal(getString(R.string.instant_onboarding_other_server)));
-    otherServerButton.setOnClickListener((v) -> {
+    findViewById(R.id.use_other_server).setOnClickListener((v) -> {
       IntentUtils.showInBrowser(this, INSTANCES_URL);
     });
     findViewById(R.id.login_button).setOnClickListener((v) -> {
-      startActivity(new Intent(this, EditRelayActivity.class));
+      startRegistrationActivity();
     });
     findViewById(R.id.scan_qr_button).setOnClickListener((v) -> {
       new IntentIntegrator(this).setCaptureActivity(RegistrationQrActivity.class).initiateScan();
     });
   }
 
+  private void startRegistrationActivity() {
+    Intent intent = new Intent(this, EditTransportActivity.class);
+    startActivity(intent);
+  }
+
   private void updateProvider() {
     if (isDcLogin) {
       signUpBtn.setText(R.string.login_title);
@@ -352,11 +367,9 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
       }
 
       if (DEFAULT_CHATMAIL_HOST.equals(providerHost)) {
-        privacyPolicyBtn.setText(TextUtil.markAsExternal(
-          getString(R.string.instant_onboarding_agree_default2, providerHost)));
+        privacyPolicyBtn.setText(getString(R.string.instant_onboarding_agree_default2, providerHost));
       } else {
-        privacyPolicyBtn.setText(TextUtil.markAsExternal(
-          getString(R.string.instant_onboarding_agree_instance, providerHost)));
+        privacyPolicyBtn.setText(getString(R.string.instant_onboarding_agree_instance, providerHost));
       }
     }
   }

src/main/java/org/thoughtcrime/securesms/LocalHelpActivity.java

@@ -5,9 +5,6 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 
-import androidx.activity.OnBackPressedCallback;
-
-import org.thoughtcrime.securesms.util.TextUtil;
 import org.thoughtcrime.securesms.util.Util;
 
 import java.io.InputStream;
@@ -47,18 +44,6 @@ public class LocalHelpActivity extends WebViewActivity
       e.printStackTrace();
     }
 
-    getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
-      @Override
-      public void handleOnBackPressed() {
-        if (webView.canGoBack()) {
-          webView.goBack();
-        } else {
-          setEnabled(false);
-          getOnBackPressedDispatcher().onBackPressed();
-        }
-      }
-    });
-
     webView.loadUrl("file:///android_asset/" + helpPath.replace("LANG", helpLang) + (section!=null? section : ""));
   }
 
@@ -66,28 +51,6 @@ public class LocalHelpActivity extends WebViewActivity
   public boolean onPrepareOptionsMenu(Menu menu) {
     super.onPrepareOptionsMenu(menu);
     this.getMenuInflater().inflate(R.menu.local_help, menu);
-
-    // Append " ↗" to external link buttons
-    MenuItem item = menu.findItem(R.id.learn_more);
-    if (item != null) {
-      item.setTitle(TextUtil.markAsExternal(getString(R.string.delta_chat_homepage)));
-    }
-
-    item = menu.findItem(R.id.privacy_policy);
-    if (item != null) {
-      item.setTitle(TextUtil.markAsExternal(getString(R.string.privacy_policy)));
-    }
-
-    item = menu.findItem(R.id.contribute);
-    if (item != null) {
-      item.setTitle(TextUtil.markAsExternal(getString(R.string.contribute)));
-    }
-
-    item = menu.findItem(R.id.report_issue);
-    if (item != null) {
-      item.setTitle(TextUtil.markAsExternal(getString(R.string.global_menu_help_report_desktop)));
-    }
-
     return true;
   }
 
@@ -114,6 +77,15 @@ public class LocalHelpActivity extends WebViewActivity
     return false;
   }
 
+  @Override
+  public void onBackPressed() {
+    if (webView.canGoBack()) {
+      webView.goBack();
+    } else {
+      super.onBackPressed();
+    }
+  }
+
   private boolean assetExists(String fileName) {
     // test using AssetManager.open();
     // AssetManager.list() is unreliable eg. on my Android 7 Moto G

src/main/java/org/thoughtcrime/securesms/LogViewActivity.java

@@ -36,6 +36,7 @@ public class LogViewActivity extends BaseActionBarActivity {
     transaction.commit();
 
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
   }
 
   @Override