diff --git a/.gitignore b/.gitignore
index c7c85bfa0..67e423d92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,15 @@ pom.xml.*
 # OS Specific
 [Tt]humbs.db
 .DS_Store
+
+# fastlane specific
+fastlane/report.xml
+# deliver temporary files
+fastlane/Preview.html
+# snapshot generated screenshots
+fastlane/screenshots
+# scan temporary files
+fastlane/test_output
+
+# omit for now:
+fastlane/Appfile
\ No newline at end of file
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
new file mode 100644
index 000000000..ebdc4543d
--- /dev/null
+++ b/fastlane/Fastfile
@@ -0,0 +1,66 @@
+# Customise this file, documentation can be found here:
+# https://github.com/fastlane/fastlane/tree/master/fastlane/docs
+# All available actions: https://docs.fastlane.tools/actions
+# can also be listed using the `fastlane actions` command
+
+# Change the syntax highlighting to Ruby
+# All lines starting with a # are ignored when running `fastlane`
+
+# If you want to automatically update fastlane if a new version is available:
+# update_fastlane
+
+# This is the minimum version number required.
+# Update this, if you use features of a newer version
+fastlane_version "2.28.5"
+
+default_platform :android
+
+platform :android do
+  before_all do
+    # ENV["SLACK_URL"] = "https://hooks.slack.com/services/..."
+  end
+
+  desc "Runs all the tests"
+  lane :test do
+    gradle(task: "test")
+  end
+
+  desc "Submit a new Beta Build to Crashlytics Beta"
+  lane :beta do
+    gradle(task: "assembleRelease")
+    crashlytics
+
+    # sh "your_script.sh"
+    # You can also use other beta testing services here
+  end
+
+  desc "Deploy a new version to the Google Play"
+  lane :deploy do
+    gradle(task: "assembleRelease")
+    supply
+  end
+
+  # You can define as many lanes as you want
+
+  after_all do |lane|
+    # This block is called, only if the executed lane was successful
+
+    # slack(
+    #   message: "Successfully deployed new App Update."
+    # )
+  end
+
+  error do |lane, exception|
+    # slack(
+    #   message: exception.message,
+    #   success: false
+    # )
+  end
+end
+
+
+# More information about multiple platforms in fastlane: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Platforms.md
+# All available actions: https://docs.fastlane.tools/actions
+
+# fastlane reports which actions are used
+# No personal data is sent or shared. Learn more at https://github.com/fastlane/enhancer
diff --git a/fastlane/metadata/android/en-US/changelogs/29203.txt b/fastlane/metadata/android/en-US/changelogs/29203.txt
new file mode 100644
index 000000000..c31ca5d78
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/29203.txt
@@ -0,0 +1,10 @@
+## 3.0
+  * Full support for Yubikey signature generation and decryption!
+  * Propose installable compatible apps in apps list
+  * New design for decryption screens
+  * Many fixes for key import, also fixes stripped keys
+  * Honor and display key authenticate flags
+  * User interface to generate custom keys
+  * Fixing user id revocation certificates
+  * New cloud search (searches over traditional keyservers and keybase.io)
+  * Support for stripping keys inside OpenKeychain
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/30000.txt b/fastlane/metadata/android/en-US/changelogs/30000.txt
new file mode 100644
index 000000000..3535b0bb0
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/30000.txt
@@ -0,0 +1,10 @@
+3.0
+* Full support for Yubikey signature generation and decryption!
+* Propose installable compatible apps in apps list
+* New design for decryption screens
+* Many fixes for key import, also fixes stripped keys
+* Honor and display key authenticate flags
+* User interface to generate custom keys
+* Fixing user id revocation certificates
+* New cloud search (searches over traditional keyservers and keybase.io)
+* Support for stripping keys inside OpenKeychain
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/30100.txt b/fastlane/metadata/android/en-US/changelogs/30100.txt
new file mode 100644
index 000000000..3fd8511ee
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/30100.txt
@@ -0,0 +1,14 @@
+3.0.1
+* Better handling of large key imports
+* Improved subkey selection
+
+3.0
+* Full support for Yubikey signature generation and decryption!
+* Propose installable compatible apps in apps list
+* New design for decryption screens
+* Many fixes for key import, also fixes stripped keys
+* Honor and display key authenticate flags
+* User interface to generate custom keys
+* Fixing user id revocation certificates
+* New cloud search (searches over traditional keyservers and keybase.io)
+[...]
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/30101.txt b/fastlane/metadata/android/en-US/changelogs/30101.txt
new file mode 100644
index 000000000..3fd8511ee
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/30101.txt
@@ -0,0 +1,14 @@
+3.0.1
+* Better handling of large key imports
+* Improved subkey selection
+
+3.0
+* Full support for Yubikey signature generation and decryption!
+* Propose installable compatible apps in apps list
+* New design for decryption screens
+* Many fixes for key import, also fixes stripped keys
+* Honor and display key authenticate flags
+* User interface to generate custom keys
+* Fixing user id revocation certificates
+* New cloud search (searches over traditional keyservers and keybase.io)
+[...]
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/31000.txt b/fastlane/metadata/android/en-US/changelogs/31000.txt
new file mode 100644
index 000000000..9b5f59f1e
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/31000.txt
@@ -0,0 +1,13 @@
+3.1
+* Fix crash on Android 5
+* New certify screen
+* Secure Exchange directly from key list (SafeSlinger library)
+* New QR Code program flow
+* Redesigned decrypt screen
+* New icon usage and colors
+* Fix import of secret keys from Symantec Encryption Desktop
+* Subkey IDs on Yubikeys are now checked correctly
+
+3.0.1
+* Better handling of large key imports
+* Improved subkey selection
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/31100.txt b/fastlane/metadata/android/en-US/changelogs/31100.txt
new file mode 100644
index 000000000..2f13104ec
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/31100.txt
@@ -0,0 +1,17 @@
+3.1.1
+* Fix key export to files (they were written partially)
+* Fix crash on Android 2.3
+
+3.1
+* Fix crash on Android 5
+* New certify screen
+* Secure Exchange directly from key list (SafeSlinger library)
+* New QR Code program flow
+* Redesigned decrypt screen
+* New icon usage and colors
+* Fix import of secret keys from Symantec Encryption Desktop
+* Subkey IDs on Yubikeys are now checked correctly
+
+3.0.1
+* Better handling of large key imports
+* Improved subkey selection
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/31200.txt b/fastlane/metadata/android/en-US/changelogs/31200.txt
new file mode 100644
index 000000000..ec01933ce
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/31200.txt
@@ -0,0 +1,16 @@
+3.1.2
+* Fix key export to files (now for real)
+
+3.1.1
+* Fix key export to files (they were written partially)
+* Fix crash on Android 2.3
+
+3.1
+* Fix crash on Android 5
+* New certify screen
+* Secure Exchange directly from key list (SafeSlinger library)
+* New QR Code program flow
+* Redesigned decrypt screen
+* New icon usage and colors
+* Fix import of secret keys from Symantec Encryption Desktop
+* Subkey IDs on Yubikeys are now checked correctly
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/31201.txt b/fastlane/metadata/android/en-US/changelogs/31201.txt
new file mode 100644
index 000000000..49a2c9292
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/31201.txt
@@ -0,0 +1,9 @@
+3.2 beta1
+* Experimental support for keybase.io proofs
+
+3.1.2
+* Fix key export to files (now for real)
+
+3.1.1
+* Fix key export to files (they were written partially)
+* Fix crash on Android 2.3
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/31202.txt b/fastlane/metadata/android/en-US/changelogs/31202.txt
new file mode 100644
index 000000000..6155a8bd8
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/31202.txt
@@ -0,0 +1,12 @@
+## 3.2beta2
+  * Material design
+  * Integration of QR Scanner (New permissions required)
+  * Improved key creation wizard
+  * Fix missing contacts after sync
+  * Requires Android 4
+  * Redesigned key screen
+  * Simplify crypto preferences, better selection of secure ciphers
+  * API: Detached signatures, free selection of signing key,...
+  * Fix: Some valid keys were shown revoked or expired
+  * Don't accept signatures by expired or revoked subkeys
+  * Keybase.io support in advanced view
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/31203.txt b/fastlane/metadata/android/en-US/changelogs/31203.txt
new file mode 100644
index 000000000..6155a8bd8
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/31203.txt
@@ -0,0 +1,12 @@
+## 3.2beta2
+  * Material design
+  * Integration of QR Scanner (New permissions required)
+  * Improved key creation wizard
+  * Fix missing contacts after sync
+  * Requires Android 4
+  * Redesigned key screen
+  * Simplify crypto preferences, better selection of secure ciphers
+  * API: Detached signatures, free selection of signing key,...
+  * Fix: Some valid keys were shown revoked or expired
+  * Don't accept signatures by expired or revoked subkeys
+  * Keybase.io support in advanced view
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/32000.txt b/fastlane/metadata/android/en-US/changelogs/32000.txt
new file mode 100644
index 000000000..cb0d57fb1
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/32000.txt
@@ -0,0 +1,11 @@
+3.2
+  * First version with full YubiKey support available from the user interface: Edit keys, bind YubiKey to keys,...
+  * Material design
+  * Integration of QR Code Scanning (New permissions required)
+  * Improved key creation wizard
+  * Fix missing contacts after sync
+  * Requires Android 4
+  * Redesigned key screen
+  * API: Detached signatures, free selection of signing key,...
+  * Keybase.io support in advanced view
+  * Method to update all keys at once
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/32100.txt b/fastlane/metadata/android/en-US/changelogs/32100.txt
new file mode 100644
index 000000000..7cab0dc97
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/32100.txt
@@ -0,0 +1,14 @@
+3.2.1
+  * Fixing regression bugs
+
+3.2
+  * First version with full YubiKey support available from the user interface: Edit keys, bind YubiKey to keys,...
+  * Material design
+  * Integration of QR Code Scanning (New permissions required)
+  * Improved key creation wizard
+  * Fix missing contacts after sync
+  * Requires Android 4
+  * Redesigned key screen
+  * API: Detached signatures, free selection of signing key,...
+  * Keybase.io support in advanced view
+  * Method to update all keys at once
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/32200.txt b/fastlane/metadata/android/en-US/changelogs/32200.txt
new file mode 100644
index 000000000..7d50d9a4b
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/32200.txt
@@ -0,0 +1,2 @@
+3.2.2
+  * Fixing regression bugs
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/32300.txt b/fastlane/metadata/android/en-US/changelogs/32300.txt
new file mode 100644
index 000000000..3b776c8f5
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/32300.txt
@@ -0,0 +1,2 @@
+3.2.3
+  * Fixing regression bugs
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/33000.txt b/fastlane/metadata/android/en-US/changelogs/33000.txt
new file mode 100644
index 000000000..ce49f52df
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/33000.txt
@@ -0,0 +1,4 @@
+3.3
+  * New decryption screen
+  * Decryption of multiple files at once
+  * Better handling of YubiKey errors
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/34000.txt b/fastlane/metadata/android/en-US/changelogs/34000.txt
new file mode 100644
index 000000000..460cd7660
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/34000.txt
@@ -0,0 +1,4 @@
+3.4
+  * Anonymous key download over Tor
+  * Proxy support
+  * Better YubiKey error handling
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/34100.txt b/fastlane/metadata/android/en-US/changelogs/34100.txt
new file mode 100644
index 000000000..460cd7660
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/34100.txt
@@ -0,0 +1,4 @@
+3.4
+  * Anonymous key download over Tor
+  * Proxy support
+  * Better YubiKey error handling
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/35000.txt b/fastlane/metadata/android/en-US/changelogs/35000.txt
new file mode 100644
index 000000000..303abfe25
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/35000.txt
@@ -0,0 +1,5 @@
+3.5
+  * Key revocation on key deletion
+  * Improved checks for insecure cryptography
+  * Fix: Don't close OpenKeychain after first time wizard succeeds
+  * API: Version 8
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/35100.txt b/fastlane/metadata/android/en-US/changelogs/35100.txt
new file mode 100644
index 000000000..303abfe25
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/35100.txt
@@ -0,0 +1,5 @@
+3.5
+  * Key revocation on key deletion
+  * Improved checks for insecure cryptography
+  * Fix: Don't close OpenKeychain after first time wizard succeeds
+  * API: Version 8
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/36000.txt b/fastlane/metadata/android/en-US/changelogs/36000.txt
new file mode 100644
index 000000000..d2aa81748
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/36000.txt
@@ -0,0 +1,10 @@
+3.6
+  * Encrypted backups
+  * Security fixes based on external security audit
+  * YubiKey NEO key creation wizard
+  * Basic internal MIME support
+  * Automatic key synchronization
+  * Experimental feature: link keys to Github, Twitter accounts
+  * Experimental feature: key confirmation via phrases
+  * Experimental feature: dark theme
+  * API: Version 9
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/36100.txt b/fastlane/metadata/android/en-US/changelogs/36100.txt
new file mode 100644
index 000000000..d2aa81748
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/36100.txt
@@ -0,0 +1,10 @@
+3.6
+  * Encrypted backups
+  * Security fixes based on external security audit
+  * YubiKey NEO key creation wizard
+  * Basic internal MIME support
+  * Automatic key synchronization
+  * Experimental feature: link keys to Github, Twitter accounts
+  * Experimental feature: key confirmation via phrases
+  * Experimental feature: dark theme
+  * API: Version 9
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/37000.txt b/fastlane/metadata/android/en-US/changelogs/37000.txt
new file mode 100644
index 000000000..df144009f
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/37000.txt
@@ -0,0 +1,14 @@
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
+
+3.6
+  * Encrypted backups
+  * Security fixes based on external security audit
+  * YubiKey NEO key creation wizard
+  * Basic internal MIME support
+  * Automatic key synchronization
+  * Experimental feature: link keys to Github, Twitter accounts
+  * Experimental feature: key confirmation via phrases
+  * Experimental feature: dark theme
+  * API: Version 9
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/38000.txt b/fastlane/metadata/android/en-US/changelogs/38000.txt
new file mode 100644
index 000000000..55950517e
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/38000.txt
@@ -0,0 +1,7 @@
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/38100.txt b/fastlane/metadata/android/en-US/changelogs/38100.txt
new file mode 100644
index 000000000..55950517e
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/38100.txt
@@ -0,0 +1,7 @@
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/38200.txt b/fastlane/metadata/android/en-US/changelogs/38200.txt
new file mode 100644
index 000000000..55950517e
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/38200.txt
@@ -0,0 +1,7 @@
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/39000.txt b/fastlane/metadata/android/en-US/changelogs/39000.txt
new file mode 100644
index 000000000..22eacd9a3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/39000.txt
@@ -0,0 +1,13 @@
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/39100.txt b/fastlane/metadata/android/en-US/changelogs/39100.txt
new file mode 100644
index 000000000..22eacd9a3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/39100.txt
@@ -0,0 +1,13 @@
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/39200.txt b/fastlane/metadata/android/en-US/changelogs/39200.txt
new file mode 100644
index 000000000..22eacd9a3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/39200.txt
@@ -0,0 +1,13 @@
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/39300.txt b/fastlane/metadata/android/en-US/changelogs/39300.txt
new file mode 100644
index 000000000..22eacd9a3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/39300.txt
@@ -0,0 +1,13 @@
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/39400.txt b/fastlane/metadata/android/en-US/changelogs/39400.txt
new file mode 100644
index 000000000..22eacd9a3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/39400.txt
@@ -0,0 +1,13 @@
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/39500.txt b/fastlane/metadata/android/en-US/changelogs/39500.txt
new file mode 100644
index 000000000..22eacd9a3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/39500.txt
@@ -0,0 +1,13 @@
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/39510.txt b/fastlane/metadata/android/en-US/changelogs/39510.txt
new file mode 100644
index 000000000..22eacd9a3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/39510.txt
@@ -0,0 +1,13 @@
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/39600.txt b/fastlane/metadata/android/en-US/changelogs/39600.txt
new file mode 100644
index 000000000..22eacd9a3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/39600.txt
@@ -0,0 +1,13 @@
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/40000.txt b/fastlane/metadata/android/en-US/changelogs/40000.txt
new file mode 100644
index 000000000..cccf2f8ee
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40000.txt
@@ -0,0 +1,18 @@
+4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
+
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/40100.txt b/fastlane/metadata/android/en-US/changelogs/40100.txt
new file mode 100644
index 000000000..cccf2f8ee
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40100.txt
@@ -0,0 +1,18 @@
+4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
+
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/40200.txt b/fastlane/metadata/android/en-US/changelogs/40200.txt
new file mode 100644
index 000000000..cccf2f8ee
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40200.txt
@@ -0,0 +1,18 @@
+4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
+
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/40300.txt b/fastlane/metadata/android/en-US/changelogs/40300.txt
new file mode 100644
index 000000000..cccf2f8ee
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40300.txt
@@ -0,0 +1,18 @@
+4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
+
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/41000.txt b/fastlane/metadata/android/en-US/changelogs/41000.txt
new file mode 100644
index 000000000..cccf2f8ee
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/41000.txt
@@ -0,0 +1,18 @@
+4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
+
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/41001.txt b/fastlane/metadata/android/en-US/changelogs/41001.txt
new file mode 100644
index 000000000..cccf2f8ee
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/41001.txt
@@ -0,0 +1,18 @@
+4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
+
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/41002.txt b/fastlane/metadata/android/en-US/changelogs/41002.txt
new file mode 100644
index 000000000..cccf2f8ee
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/41002.txt
@@ -0,0 +1,18 @@
+4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
+
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+
+3.7
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/41010.txt b/fastlane/metadata/android/en-US/changelogs/41010.txt
new file mode 100644
index 000000000..35623ffe2
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/41010.txt
@@ -0,0 +1,18 @@
+4.1
+
+  * Better detection of emails and other content when opened
+
+4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
+
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/42000.txt b/fastlane/metadata/android/en-US/changelogs/42000.txt
new file mode 100644
index 000000000..35623ffe2
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/42000.txt
@@ -0,0 +1,18 @@
+4.1
+
+  * Better detection of emails and other content when opened
+
+4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
+
+3.9
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+  * Add option to donate (requires in-app purchase permission)
+
+3.8
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/42001.txt b/fastlane/metadata/android/en-US/changelogs/42001.txt
new file mode 100644
index 000000000..030c4ae50
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/42001.txt
@@ -0,0 +1,15 @@
+4.2
+
+  * Experimental support for Elliptic Curve Encryption with Security Tokens
+  * Redesigned key import screen
+  * Design improvements to key lists
+  * Support for keyserver onion addresses
+
+4.1
+
+  * Better detection of emails and other content when opened
+
+4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/42002.txt b/fastlane/metadata/android/en-US/changelogs/42002.txt
new file mode 100644
index 000000000..030c4ae50
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/42002.txt
@@ -0,0 +1,15 @@
+4.2
+
+  * Experimental support for Elliptic Curve Encryption with Security Tokens
+  * Redesigned key import screen
+  * Design improvements to key lists
+  * Support for keyserver onion addresses
+
+4.1
+
+  * Better detection of emails and other content when opened
+
+4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/42100.txt b/fastlane/metadata/android/en-US/changelogs/42100.txt
new file mode 100644
index 000000000..030c4ae50
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/42100.txt
@@ -0,0 +1,15 @@
+4.2
+
+  * Experimental support for Elliptic Curve Encryption with Security Tokens
+  * Redesigned key import screen
+  * Design improvements to key lists
+  * Support for keyserver onion addresses
+
+4.1
+
+  * Better detection of emails and other content when opened
+
+4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/42201.txt b/fastlane/metadata/android/en-US/changelogs/42201.txt
new file mode 100644
index 000000000..030c4ae50
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/42201.txt
@@ -0,0 +1,15 @@
+4.2
+
+  * Experimental support for Elliptic Curve Encryption with Security Tokens
+  * Redesigned key import screen
+  * Design improvements to key lists
+  * Support for keyserver onion addresses
+
+4.1
+
+  * Better detection of emails and other content when opened
+
+4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/42202.txt b/fastlane/metadata/android/en-US/changelogs/42202.txt
new file mode 100644
index 000000000..030c4ae50
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/42202.txt
@@ -0,0 +1,15 @@
+4.2
+
+  * Experimental support for Elliptic Curve Encryption with Security Tokens
+  * Redesigned key import screen
+  * Design improvements to key lists
+  * Support for keyserver onion addresses
+
+4.1
+
+  * Better detection of emails and other content when opened
+
+4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/42300.txt b/fastlane/metadata/android/en-US/changelogs/42300.txt
new file mode 100644
index 000000000..030c4ae50
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/42300.txt
@@ -0,0 +1,15 @@
+4.2
+
+  * Experimental support for Elliptic Curve Encryption with Security Tokens
+  * Redesigned key import screen
+  * Design improvements to key lists
+  * Support for keyserver onion addresses
+
+4.1
+
+  * Better detection of emails and other content when opened
+
+4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/42400.txt b/fastlane/metadata/android/en-US/changelogs/42400.txt
new file mode 100644
index 000000000..030c4ae50
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/42400.txt
@@ -0,0 +1,15 @@
+4.2
+
+  * Experimental support for Elliptic Curve Encryption with Security Tokens
+  * Redesigned key import screen
+  * Design improvements to key lists
+  * Support for keyserver onion addresses
+
+4.1
+
+  * Better detection of emails and other content when opened
+
+4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/43000.txt b/fastlane/metadata/android/en-US/changelogs/43000.txt
new file mode 100644
index 000000000..e198ce11d
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/43000.txt
@@ -0,0 +1 @@
+Thanks for testing the beta version. Please report potential bugs!
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/44000.txt b/fastlane/metadata/android/en-US/changelogs/44000.txt
new file mode 100644
index 000000000..e198ce11d
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/44000.txt
@@ -0,0 +1 @@
+Thanks for testing the beta version. Please report potential bugs!
\ 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
new file mode 100644
index 000000000..ab1b998e9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -0,0 +1,22 @@
+OpenKeychain helps you communicate more privately and securely. It uses encryption to ensure that your messages can be read only by the people you send them to, others can send you messages that only you can read, and these messages can be digitally signed so the people getting them are sure who sent them. OpenKeychain is based on the well established OpenPGP standard making encryption compatible across your devices and systems. For a list of compatible software for Windows, Mac OS, and other operating systems consult http://openpgp.org/software/.
+
+Modern encryption is based on digital “keys”. OpenKeychain stores and manages your keys, and those of the people you communicate with, on your Android smartphone. It also helps you find others’ keys online, and exchange keys. But its most frequent use is in using those keys to encrypt and decrypt messages.
+
+★ Integration with other Apps:
+• K-9 Mail
+• Conversations
+• and many more…
+
+★ Open Source: OpenKeychain is designed to be trustworthy. It’s Free Software with no secrets; anyone can examine and validate every bit of it (Source code available at https://github.com/open-keychain/open-keychain)
+
+★ Independent Security Audit: The auditing company Cure53 performed an intensive security audit of OpenKeychain. The security experts summarize their final result with "[...] none of the spotted issues were considered to be of a critical severity in terms of security implications. The latter is a significant and impressive result for an app of this complexity and relevance."
+
+★ Permissions: Because OpenKeychain is Free Software, anyone can validate that the permissions are indeed only required for the listed features.
+• In-app purchases: Donate to the developers
+• Identity: Pre-fill name and email addresses
+• Contacts: Connect keys to your contacts (only offline)
+• Photos/Media/Files: Import/export keys from SD card
+• Camera: Scan QR Codes to add other people's keys
+• Others: Internet permission to retrieve keys, NFC permission to use YubiKeys
+
+Starting with Android 6, permissions are requested when required in-app!
\ No newline at end of file
diff --git a/graphics/drawables/function.png b/fastlane/metadata/android/en-US/images/featureGraphic.png
similarity index 100%
rename from graphics/drawables/function.png
rename to fastlane/metadata/android/en-US/images/featureGraphic.png
diff --git a/graphics/drawables/function.svg b/fastlane/metadata/android/en-US/images/featureGraphic.svg
similarity index 100%
rename from graphics/drawables/function.svg
rename to fastlane/metadata/android/en-US/images/featureGraphic.svg
diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
new file mode 100644
index 000000000..c3416bef3
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/icon.png differ
diff --git a/graphics/screenshots/device-2015-05-06-140816.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/device-2015-05-06-140816.png
similarity index 100%
rename from graphics/screenshots/device-2015-05-06-140816.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/device-2015-05-06-140816.png
diff --git a/graphics/screenshots/device-2015-05-06-141500.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/device-2015-05-06-141500.png
similarity index 100%
rename from graphics/screenshots/device-2015-05-06-141500.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/device-2015-05-06-141500.png
diff --git a/graphics/screenshots/device-2015-05-06-141508.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/device-2015-05-06-141508.png
similarity index 100%
rename from graphics/screenshots/device-2015-05-06-141508.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/device-2015-05-06-141508.png
diff --git a/graphics/screenshots/device-2015-05-06-141517.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/device-2015-05-06-141517.png
similarity index 100%
rename from graphics/screenshots/device-2015-05-06-141517.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/device-2015-05-06-141517.png
diff --git a/graphics/screenshots/device-2015-05-06-141527.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/device-2015-05-06-141527.png
similarity index 100%
rename from graphics/screenshots/device-2015-05-06-141527.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/device-2015-05-06-141527.png
diff --git a/graphics/screenshots/device-2015-05-06-141552.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/device-2015-05-06-141552.png
similarity index 100%
rename from graphics/screenshots/device-2015-05-06-141552.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/device-2015-05-06-141552.png
diff --git a/graphics/screenshots/device-2015-05-06-142026.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/device-2015-05-06-142026.png
similarity index 100%
rename from graphics/screenshots/device-2015-05-06-142026.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/device-2015-05-06-142026.png
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..7692dc56a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -0,0 +1 @@
+Encrypt your Files and Communications. Compatible with the OpenPGP Standard.
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt
new file mode 100644
index 000000000..ee1ccc62e
--- /dev/null
+++ b/fastlane/metadata/android/en-US/title.txt
@@ -0,0 +1 @@
+OpenKeychain: Easy PGP
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/video.txt b/fastlane/metadata/android/en-US/video.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/graphics/screenshots/device-2015-02-20-110958.png b/graphics/screenshots/device-2015-02-20-110958.png
deleted file mode 100644
index cc522b7a4..000000000
Binary files a/graphics/screenshots/device-2015-02-20-110958.png and /dev/null differ