diff --git a/CHANGELOG.md b/CHANGELOG.md
index f45e7c70d..04afb8b3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,37 @@
 # Delta Chat Android Changelog
 
+## v1.36.0
+2023-03
+
+* new, easy method of adding a second device to your account:
+  select "Add as a Second Device" after installation and scan a QR code from the old device
+* view "All Media" of all chats by the corresponding option in the chat list's menu
+* add "Clear Chat" option to remove all messages from a chat
+* show non-deltachat emails by default for new installations
+  (you can change this at "Settings / Chats and Media)
+* show notifications for all accounts
+* make better use of dark/light mode in "Show full message"
+* show icon beside info messages of apps
+* resilience against outages by caching DNS results for SMTP connections
+  (IMAP connections are already cached since 1.34.11)
+* prefer TLS over STARTTLS during autoconfiguration, set minimum TLS version to 1.2
+* use SOCKS5 configuration also for HTTP requests
+* make invite QR codes even prettier
+* improve speed by reorganizing the database connection pool
+* improve speed by decrypting messages in parallel
+* improve reliability by using read/write instead of per-command timeouts for SMTP
+* improve reliability by closing databases sooner
+* improve compatibility with encrypted messages from non-deltachat clients
+* fix: Skip "Show full message" if the additional text is only a footer already shown in the profile
+* fix verifications when using for multiple devices
+* fix backup imports for backups seemingly work at first
+* fix a problem with gmail where (auto-)deleted messages would get archived instead of deleted
+* fix deletion of more than 32000 messages at the same time
+* update provider database
+* update translations and local help
+* update to core112.1
+
+
 ## v1.34.13
 2023-02
 
diff --git a/build.gradle b/build.gradle
index 7197b0a35..3969f9a3c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -96,8 +96,8 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 649
-        versionName "1.35.4"
+        versionCode 650
+        versionName "1.36.0"
 
         applicationId "com.b44t.messenger"
         multiDexEnabled true
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5607e5668..1374c1d35 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1051,5 +1051,9 @@
 
     <!-- device messages for updates -->
     <string name="update_1_34_android">What\'s new in 1.34?\n\n🤗 Friendlier contact lists: Ordered by last seen and contacts seen within 10 minutes are marked by a dot 🟢\n\n📑 New pages in chat profiles: \"Audio\" and \"Private Apps\"\n\n🖼️ If someone sends you a \"Private App\" (eg. from https://webxdc.org ), you can add it to the home screen</string>
+    <!-- placeholder will be replaced by the URL https://get.delta.chat/#changelogs -->
+    <string name="update_1_36_android">1.36 Highlights\n\n💻📱 Use Delta Chat on all your devices easily - just follow three simple steps at \"Settings / Add Second Device\" (experimental)\n\n🖼🔍 Ever searching for an image and could not remember the chat? \"All Media\" from the main menu is yours!\n\nWhat else? Notifications for all Accounts, clear chat, and more at %1$s</string>
+    <!-- placeholder will be replaced by the URL https://delta.chat/en/2023-03-27-third-independent-security-audit -->
+    <string name="update_1_36_audit">We don\'t talk much about security here, but rest assured, we care: See %1$s for recent good news 👌</string>
 
 </resources>
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index 8a4d11adb..673ccd7de 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -100,15 +100,10 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     // 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.
     DcContext dcContext = DcHelper.getContext(this);
-    if (dcContext.wasDeviceMsgEverAdded("update_1_34d_android")) {
-      // no need to explain the new archive position on new installations; it should just feel natural and overall more intuitive.
-      DcMsg msg2 = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
-      msg2.setText("\uD83D\uDDC4️ More handy and common \"Archive\" in 1.34.10: \"Unread counters\" and moving things into view fixes issues with chats that stay in archive.\n\nFor other recent bugfixes, see https://get.delta.chat/#changelogs");
-      dcContext.addDeviceMsg("update_1_34_10_android", msg2);
-    }
     DcMsg msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
-    msg.setText(getString(R.string.update_1_34_android));
-    dcContext.addDeviceMsg("update_1_34d_android", msg);
+    msg.setText(getString(R.string.update_1_36_android, "https://get.delta.chat/#changelogs")
+     + "\n\n" + getString(R.string.update_1_36_audit, "https://delta.chat/en/2023-03-27-third-independent-security-audit"));
+    dcContext.addDeviceMsg("update_1_36m_android", msg);
 
     // create view
     setContentView(R.layout.conversation_list_activity);