diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index c987d1f0da..8ed266b802 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -465,6 +465,15 @@
 
                 <data android:scheme="eu.faircode.email" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="eu.faircode.email.debug" />
+            </intent-filter>
         </activity>
 
         <service
diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index 359bd39cd1..e3bd46cd23 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -469,6 +469,15 @@
 
                 <data android:scheme="eu.faircode.email" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="eu.faircode.email.debug" />
+            </intent-filter>
         </activity>
 
         <service
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index a93eed1025..bae2956118 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -469,6 +469,15 @@
 
                 <data android:scheme="eu.faircode.email" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="eu.faircode.email.debug" />
+            </intent-filter>
         </activity>
 
         <service
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 02973f2a1b..1732b65ca0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -463,6 +463,15 @@
 
                 <data android:scheme="eu.faircode.email" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="eu.faircode.email.debug" />
+            </intent-filter>
         </activity>
 
         <service
diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
index 615fae201d..4d89f5fffd 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
@@ -403,12 +403,19 @@ public class FragmentOAuth extends FragmentBase {
                     ? new LinkedHashMap<>()
                     : provider.oauth.parameters);
 
+            String clientId = provider.oauth.clientId;
+            Uri redirectUri = Uri.parse(provider.oauth.redirectUri);
+            if ("gmail".equals(id) && BuildConfig.DEBUG) {
+                clientId = "803253368361-hr8kelm53hqodj7c6brdjeb2ctn5jg3p.apps.googleusercontent.com";
+                redirectUri = Uri.parse("eu.faircode.email.debug:/");
+            }
+
             AuthorizationRequest.Builder authRequestBuilder =
                     new AuthorizationRequest.Builder(
                             serviceConfig,
-                            provider.oauth.clientId,
+                            clientId,
                             ResponseTypeValues.CODE,
-                            Uri.parse(provider.oauth.redirectUri))
+                            redirectUri)
                             .setScopes(provider.oauth.scopes)
                             .setState(provider.id)
                             .setAdditionalParameters(params);
diff --git a/app/src/main/res/layout/fragment_gmail.xml b/app/src/main/res/layout/fragment_gmail.xml
index 297392c42a..7c2cf94c7d 100644
--- a/app/src/main/res/layout/fragment_gmail.xml
+++ b/app/src/main/res/layout/fragment_gmail.xml
@@ -165,6 +165,7 @@
             android:text="@string/title_setup_gmail_on_device"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorLink"
+            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSelectHint" />
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index 96727e2383..727c25274f 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -23,15 +23,15 @@
         <oauth
             askAccount="true"
             authorizationEndpoint="https://accounts.google.com/o/oauth2/auth"
-            clientId="495454862802-rkeb9fs6i6aqs99ieureo5nugc5g98lc.apps.googleusercontent.com"
-            clientSecret="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"
-            enabled="false"
+            clientId="803253368361-11ias0ee6bqhvdi4f21fs1lh7fsb0il2.apps.googleusercontent.com"
+            enabled="true"
             privacy="https://policies.google.com/privacy"
             prompt="consent"
-            redirectUri="https://oauth.faircode.eu/"
+            redirectUri="eu.faircode.email:/"
             scopes="https://mail.google.com/"
             tokenEndpoint="https://oauth2.googleapis.com/token">
             <!-- https://developers.google.com/identity/protocols/oauth2/native-app -->
+            <!-- https://github.com/openid/AppAuth-Android/blob/master/app/README-Google.md -->
             <parameter
                 key="access_type"
                 value="offline" />
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index 26cab85f8b..21928e1042 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -465,6 +465,15 @@
 
                 <data android:scheme="eu.faircode.email" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="eu.faircode.email.debug" />
+            </intent-filter>
         </activity>
 
         <service