diff --git a/fastlane/metadata/android/en-US/changelogs/349.txt b/fastlane/metadata/android/en-US/changelogs/349.txt
deleted file mode 100644
index b8f22adef..000000000
--- a/fastlane/metadata/android/en-US/changelogs/349.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-* Introduce expert setting to perform channel discovery on local server instead of search.jabber.network
-* Enable delivery check marks by default and remove setting
-* Enable ‘Send button indicates status’ by default and remove setting
-* Move Backup and Foreground Service settings to main screen
diff --git a/fastlane/metadata/android/en-US/changelogs/351.txt b/fastlane/metadata/android/en-US/changelogs/351.txt
deleted file mode 100644
index 8fabff2f1..000000000
--- a/fastlane/metadata/android/en-US/changelogs/351.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* fixes for Jingle IBB file transfer
-* fixes for repeated corrections filling up the database
-* switched to Last Message Correction v1.1
diff --git a/fastlane/metadata/android/en-US/changelogs/353.txt b/fastlane/metadata/android/en-US/changelogs/353.txt
deleted file mode 100644
index 63b829a80..000000000
--- a/fastlane/metadata/android/en-US/changelogs/353.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-* let users set their own nick name
-* resume download of OMEMO encrypted files
-* Channels now use '#' as symbol in avatar
-* Quicksy uses 'always' as OMEMO encryption default (hides lock icon)
diff --git a/fastlane/metadata/android/en-US/changelogs/360.txt b/fastlane/metadata/android/en-US/changelogs/360.txt
deleted file mode 100644
index 87b92f033..000000000
--- a/fastlane/metadata/android/en-US/changelogs/360.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Support for ?register and ?register;preauth XMPP uri parameters
diff --git a/fastlane/metadata/android/en-US/changelogs/362.txt b/fastlane/metadata/android/en-US/changelogs/362.txt
deleted file mode 100644
index f4bbc2ab1..000000000
--- a/fastlane/metadata/android/en-US/changelogs/362.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Support automatic theme switching on Android 10
diff --git a/fastlane/metadata/android/en-US/changelogs/364.txt b/fastlane/metadata/android/en-US/changelogs/364.txt
deleted file mode 100644
index ed2c80678..000000000
--- a/fastlane/metadata/android/en-US/changelogs/364.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Provide PDF preview on Android 5+
-* Use 12 byte IVs for OMEMO
diff --git a/fastlane/metadata/android/en-US/changelogs/367.txt b/fastlane/metadata/android/en-US/changelogs/367.txt
deleted file mode 100644
index 2f42bd95f..000000000
--- a/fastlane/metadata/android/en-US/changelogs/367.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Fix avatar selection on some Android 10 devices
-* Fix file transfer for larger files
diff --git a/fastlane/metadata/android/en-US/changelogs/379.txt b/fastlane/metadata/android/en-US/changelogs/379.txt
deleted file mode 100644
index a99adee16..000000000
--- a/fastlane/metadata/android/en-US/changelogs/379.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Audio/Video calls (Requires server support in form of STUN and TURN servers discoverable via XEP-0215)
diff --git a/fastlane/metadata/android/en-US/changelogs/381.txt b/fastlane/metadata/android/en-US/changelogs/381.txt
deleted file mode 100644
index a2df5e828..000000000
--- a/fastlane/metadata/android/en-US/changelogs/381.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Audible feedback (dialing, call started, call ended) for voice calls.
-* Fixed issue with retrying failed video call
diff --git a/fastlane/metadata/android/en-US/changelogs/382.txt b/fastlane/metadata/android/en-US/changelogs/382.txt
deleted file mode 100644
index 89fc89b78..000000000
--- a/fastlane/metadata/android/en-US/changelogs/382.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Add button to switch camea during video call
-* Fixed voice calls on tablets
diff --git a/fastlane/metadata/android/en-US/changelogs/383.txt b/fastlane/metadata/android/en-US/changelogs/383.txt
deleted file mode 100644
index 19c9a0116..000000000
--- a/fastlane/metadata/android/en-US/changelogs/383.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* Move call icon to the left in order to keep other toolbar icons in a consistent place
-* Show call duration during audio calls
-* Tie breaking for A/V calls (the same two people calling each other at the same time)
diff --git a/fastlane/metadata/android/en-US/changelogs/387.txt b/fastlane/metadata/android/en-US/changelogs/387.txt
deleted file mode 100644
index 2710be0a5..000000000
--- a/fastlane/metadata/android/en-US/changelogs/387.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Rework Login with certificate UI
-* Add ability to pin chats on top (add to favorites)
diff --git a/fastlane/metadata/android/en-US/changelogs/388.txt b/fastlane/metadata/android/en-US/changelogs/388.txt
deleted file mode 100644
index 6a4909652..000000000
--- a/fastlane/metadata/android/en-US/changelogs/388.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* Reduce echo during calls on some devices
-* Fix login when passwords contains special characters
-* Play dial and busy tones on speaker during video calls
diff --git a/fastlane/metadata/android/en-US/changelogs/390.txt b/fastlane/metadata/android/en-US/changelogs/390.txt
deleted file mode 100644
index 56ed78885..000000000
--- a/fastlane/metadata/android/en-US/changelogs/390.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Offer to record voice message when callee is busy
diff --git a/fastlane/metadata/android/en-US/changelogs/393.txt b/fastlane/metadata/android/en-US/changelogs/393.txt
deleted file mode 100644
index 82250ee87..000000000
--- a/fastlane/metadata/android/en-US/changelogs/393.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* Show help button if A/V call fails
-* Fixed some annoying crashes
-* Fixed Jingle connections (file transfer + calls) with bare JIDs
diff --git a/fastlane/metadata/android/en-US/changelogs/394.txt b/fastlane/metadata/android/en-US/changelogs/394.txt
deleted file mode 100644
index b04adbd56..000000000
--- a/fastlane/metadata/android/en-US/changelogs/394.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Fixed notifications not showing up under certain conditions
-* Fixed compatibility issues and crashes related to A/V calls
diff --git a/fastlane/metadata/android/en-US/changelogs/395.txt b/fastlane/metadata/android/en-US/changelogs/395.txt
deleted file mode 100644
index 76a654338..000000000
--- a/fastlane/metadata/android/en-US/changelogs/395.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* add 'Return to chat' to audio call screen
-* Improve keyboard shortcuts
-* bug fixes
diff --git a/fastlane/metadata/android/en-US/changelogs/397.txt b/fastlane/metadata/android/en-US/changelogs/397.txt
deleted file mode 100644
index 207b36708..000000000
--- a/fastlane/metadata/android/en-US/changelogs/397.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* Handle GPX files
-* Improve performance for backup restore
-* bug fixes
diff --git a/fastlane/metadata/android/en-US/changelogs/398.txt b/fastlane/metadata/android/en-US/changelogs/398.txt
deleted file mode 100644
index 95280ea88..000000000
--- a/fastlane/metadata/android/en-US/changelogs/398.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-* Search individual conversations
-* Notify user if message delivery fails
-* Remember display names (nicks) from Quicksy users across restarts
-* Add button to start Orbot (Tor) from notification if necessary
diff --git a/fastlane/metadata/android/en-US/changelogs/401.txt b/fastlane/metadata/android/en-US/changelogs/401.txt
deleted file mode 100644
index 0fba861d3..000000000
--- a/fastlane/metadata/android/en-US/changelogs/401.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* fixed search on Android <= 5
-* optimize memory consumption
-
diff --git a/fastlane/metadata/android/en-US/changelogs/402.txt b/fastlane/metadata/android/en-US/changelogs/402.txt
deleted file mode 100644
index 53f461756..000000000
--- a/fastlane/metadata/android/en-US/changelogs/402.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* Offer Easy Invite generation on supporting servers
-* Display GIFs send from Movim
-* store avatars in cache
diff --git a/fastlane/metadata/android/en-US/changelogs/403.txt b/fastlane/metadata/android/en-US/changelogs/403.txt
deleted file mode 100644
index 99d62ca48..000000000
--- a/fastlane/metadata/android/en-US/changelogs/403.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* Fixed connectivity issues when different accounts used different SCRAM mechanisms
-* Add support for SCRAM-SHA-512
-* Allow P2P (Jingle) file transfer with self contact
diff --git a/fastlane/metadata/android/en-US/changelogs/404.txt b/fastlane/metadata/android/en-US/changelogs/404.txt
deleted file mode 100644
index d4f2e7b6d..000000000
--- a/fastlane/metadata/android/en-US/changelogs/404.txt
+++ /dev/null
@@ -1 +0,0 @@
-* minor stability improvements for A/V calls
diff --git a/fastlane/metadata/android/en-US/changelogs/405.txt b/fastlane/metadata/android/en-US/changelogs/405.txt
deleted file mode 100644
index e858b6cd1..000000000
--- a/fastlane/metadata/android/en-US/changelogs/405.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Quicksy: Automatically receive verification SMS
diff --git a/fastlane/metadata/android/en-US/changelogs/407.txt b/fastlane/metadata/android/en-US/changelogs/407.txt
deleted file mode 100644
index e746bc7d7..000000000
--- a/fastlane/metadata/android/en-US/changelogs/407.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* Show call button for offline contacts if they previously announced support
-* Back button no longer ends call when call is connected
-* bug fixes
diff --git a/fastlane/metadata/android/en-US/changelogs/42000.txt b/fastlane/metadata/android/en-US/changelogs/42000.txt
deleted file mode 100644
index 1ecfe204d..000000000
--- a/fastlane/metadata/android/en-US/changelogs/42000.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-* Ability to select incoming call ringtone
-* Fix OpenPGP key id discovery for OpenKeychain 5.6+
-* Properly verify punycode TLS certificates
-* Improve stability of RTP session establishment (calling)
diff --git a/fastlane/metadata/android/en-US/changelogs/42006.txt b/fastlane/metadata/android/en-US/changelogs/42006.txt
deleted file mode 100644
index 91e2b904f..000000000
--- a/fastlane/metadata/android/en-US/changelogs/42006.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Verify A/V calls with preexisting OMEMO sessions
-* Improve compatibility with non libwebrtc WebRTC implementations
diff --git a/fastlane/metadata/android/en-US/changelogs/42010.txt b/fastlane/metadata/android/en-US/changelogs/42010.txt
deleted file mode 100644
index 3a1c234c1..000000000
--- a/fastlane/metadata/android/en-US/changelogs/42010.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Various bug fixes around Tor support
-* Improve call compatibility with Dino
diff --git a/fastlane/metadata/android/en-US/changelogs/42012.txt b/fastlane/metadata/android/en-US/changelogs/42012.txt
deleted file mode 100644
index 967fae964..000000000
--- a/fastlane/metadata/android/en-US/changelogs/42012.txt
+++ /dev/null
@@ -1 +0,0 @@
-* fix HTTP up/download for users that don’t trust system CAs
diff --git a/fastlane/metadata/android/en-US/changelogs/42013.txt b/fastlane/metadata/android/en-US/changelogs/42013.txt
deleted file mode 100644
index 8749f0a0f..000000000
--- a/fastlane/metadata/android/en-US/changelogs/42013.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed 'No Connectivity' issues on Android 7.1
diff --git a/fastlane/metadata/android/en-US/changelogs/42014.txt b/fastlane/metadata/android/en-US/changelogs/42014.txt
deleted file mode 100644
index 8ae96511e..000000000
--- a/fastlane/metadata/android/en-US/changelogs/42014.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Always verify domain name. No user overwrite
-* Support roster pre authentication
diff --git a/fastlane/metadata/android/en-US/changelogs/42015.txt b/fastlane/metadata/android/en-US/changelogs/42015.txt
deleted file mode 100644
index 1d478b5a0..000000000
--- a/fastlane/metadata/android/en-US/changelogs/42015.txt
+++ /dev/null
@@ -1 +0,0 @@
-* minor A/V improvements 
diff --git a/fastlane/metadata/android/en-US/changelogs/42018.txt b/fastlane/metadata/android/en-US/changelogs/42018.txt
deleted file mode 100644
index 8f4d66caa..000000000
--- a/fastlane/metadata/android/en-US/changelogs/42018.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* Show black bars when remote video does not match aspect ratio of screen
-* Improve search performance
-* Add setting to prevent screenshots
diff --git a/fastlane/metadata/android/en-US/changelogs/42022.txt b/fastlane/metadata/android/en-US/changelogs/42022.txt
deleted file mode 100644
index eaaa190fa..000000000
--- a/fastlane/metadata/android/en-US/changelogs/42022.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Fix issue with some videos not being compressed
-* Fix rare crash when opening notification
diff --git a/fastlane/metadata/android/en-US/changelogs/42023.txt b/fastlane/metadata/android/en-US/changelogs/42023.txt
deleted file mode 100644
index ed3c25380..000000000
--- a/fastlane/metadata/android/en-US/changelogs/42023.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Fix crash when rendering some quotes
-* Fix crash in welcome screen
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png
deleted file mode 100644
index edf446926..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png
deleted file mode 100644
index a3ea7d690..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png
deleted file mode 100644
index b1847dae1..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png
deleted file mode 100644
index 76d112650..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png
deleted file mode 100644
index bf13cd25d..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png
deleted file mode 100644
index fc57ca922..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png
deleted file mode 100644
index 44ce5f93b..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png
deleted file mode 100644
index 94840e6c6..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/09.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/09.png
deleted file mode 100644
index 0d18d8ce6..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/09.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/01.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/01.png
deleted file mode 100644
index d447c6b85..000000000
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/01.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/02.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/02.png
deleted file mode 100644
index 071008a45..000000000
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/02.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/03.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/03.png
deleted file mode 100644
index 03b513ea4..000000000
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/03.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/04.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/04.png
deleted file mode 100644
index 3e154ea82..000000000
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/04.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
deleted file mode 100644
index 4b41cb27b..000000000
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-An encrypted, user friendly XMPP instant messaging client optimized for mobile
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en_US/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/full_description.txt
rename to fastlane/metadata/android/en_US/full_description.txt
diff --git a/fastlane/metadata/android/en_US/images/phoneScreenshots/conversation.png b/fastlane/metadata/android/en_US/images/phoneScreenshots/conversation.png
new file mode 100644
index 000000000..eb74ffb5a
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/phoneScreenshots/conversation.png differ
diff --git a/fastlane/metadata/android/en_US/short_description.txt b/fastlane/metadata/android/en_US/short_description.txt
new file mode 100644
index 000000000..7631d2c50
--- /dev/null
+++ b/fastlane/metadata/android/en_US/short_description.txt
@@ -0,0 +1 @@
+A user friendly chat client for the Jabber network (using the XMPP protocol) with a focus on features for gateway users.