From 34f5af5ed1cf3f2acf7aba3e9498772cad6919f5 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey@thunderbird.net>
Date: Mon, 20 Jul 2026 14:16:32 -0400
Subject: [PATCH 1/2] 21.0

---
 android_release/21.0.yml | 69 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 android_release/21.0.yml

diff --git a/android_release/21.0.yml b/android_release/21.0.yml
new file mode 100644
index 000000000..082a839d9
--- /dev/null
+++ b/android_release/21.0.yml
@@ -0,0 +1,69 @@
+release:
+  release_date: '2026-07-20'
+  text: >
+    **These notes apply to Thunderbird for Android version 21.0 released July 20th, 2026.**
+
+  releases:
+    - version: '21.0'
+      release_date: '2026-07-20'
+
+notes:
+  # Changed
+  - note: Animation setting now allows On, Off, and System Default options
+    short_note: Animation setting now allows On, Off, and System Default options
+    pull_requests: [10800]
+    issues: [6027]
+    tag: changed
+  - note: Modernized 'Fetching mail' account settings screen
+    short_note: Modernized 'Fetching mail' account settings screen
+    pull_requests: [11044]
+    issues: [11040]
+    tag: changed
+  - note: Modernized 'Composition defaults' screen
+    short_note: Modernized 'Composition defaults' screen
+    pull_requests: [11012]
+    issues: [10724]
+    tag: changed
+
+  # Fixed
+  - note: Application could crash due to memory exhaustion
+    short_note: Application could crash due to memory exhaustion
+    pull_requests: [11154]
+    issues: [11153]
+    tag: fixed
+  - note: Application could crash when rendering long messages
+    short_note: Application could crash when rendering long messages
+    pull_requests: [11149]
+    issues: [11148]
+    tag: fixed
+  - note: Inline images were shown as attachments instead of displaying in message
+    short_note: Inline images were shown as attachments instead of displaying in message
+    pull_requests: [11082]
+    issues: [10889]
+    tag: fixed
+  - note: Server search results could disappear after loading
+    short_note: Server search results could disappear
+    pull_requests: [11032]
+    issues: [9142]
+    tag: fixed
+  - note: Manage Folders opened the wrong account instead of the selected account
+    short_note: Manage Folders opened the wrong account instead of the selected account
+    pull_requests: [11221]
+    issues: [11128]
+    tag: fixed
+  - note: Android widget text scaled too large when system font size was increased
+    pull_requests: [11081]
+    issues: [7790]
+    tag: fixed
+  - note: Cancelling the Thundermail OAuth process incorrectly redirects users to the "Redirecting to Thundermail" screen
+    pull_requests: [11045]
+    issues: [11043]
+    tag: fixed
+  - note: Custom swipe actions were not restored from exported settings backups
+    pull_requests: [10893]
+    issues: [10621]
+    tag: fixed
+  - note: Links failed when trailing punctuation was incorrectly included in URLs
+    pull_requests: [11118]
+    issues: [11060]
+    tag: fixed

From c12aab184ba2c18678c375facec76dd630e6db96 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey@thunderbird.net>
Date: Mon, 20 Jul 2026 14:18:27 -0400
Subject: [PATCH 2/2] 21.0 shorten short notes

---
 android_release/21.0.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android_release/21.0.yml b/android_release/21.0.yml
index 082a839d9..62695fd76 100644
--- a/android_release/21.0.yml
+++ b/android_release/21.0.yml
@@ -46,8 +46,8 @@ notes:
     pull_requests: [11032]
     issues: [9142]
     tag: fixed
-  - note: Manage Folders opened the wrong account instead of the selected account
-    short_note: Manage Folders opened the wrong account instead of the selected account
+  - note: Manage Folders opened the wrong account instead of selected account
+    short_note: Manage Folders opened the wrong account instead of selected account
     pull_requests: [11221]
     issues: [11128]
     tag: fixed