diff --git a/app/build.gradle b/app/build.gradle
index f922c554b9..edccedaba4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,6 +28,8 @@ android {
versionName "1." + getVersionCode()
archivesBaseName = "FairEmail-v$versionName" + getRevision()
+ manifestPlaceholders = [namespace: applicationId.replace('.debug', '')]
+
buildConfigField "String", "REVISION", "\"" + getRevision() + "\""
buildConfigField "String", "RELEASE_NAME", "\"" + getReleaseName() + "\""
diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index 83bb6be236..47a3f079af 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -255,7 +255,7 @@
-
+
@@ -469,16 +469,7 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -489,7 +480,7 @@
+ android:scheme="msauth.${namespace}" />
diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index 05ee18cb00..198850aad2 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -261,7 +261,7 @@
-
+
@@ -475,16 +475,7 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -495,7 +486,7 @@
+ android:scheme="msauth.${namespace}" />
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index 0b774a31c6..094751156a 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -261,7 +261,7 @@
-
+
@@ -475,16 +475,7 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -495,7 +486,7 @@
+ android:scheme="msauth.${namespace}" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 15bfdb9586..b5388cb559 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -254,7 +254,7 @@
-
+
@@ -467,16 +467,7 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -487,7 +478,7 @@
+ android:scheme="msauth.${namespace}" />
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index c30b79fb33..ae9f86aa09 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -255,7 +255,7 @@
-
+
@@ -469,16 +469,7 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -489,7 +480,7 @@
+ android:scheme="msauth.${namespace}" />