diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
index 1d2441cee1..082ad987f9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
@@ -213,7 +213,8 @@ public class FragmentOAuth extends FragmentBase {
                                     Browsers.SBrowser.SIGNATURE_SET,
                                     true,
                                     VersionRange.atMost("5.3"));
-                            return !sbrowser.matches(descriptor);
+                            return (!sbrowser.matches(descriptor) &&
+                                    (!"gmail".equals(provider.id) || !descriptor.useCustomTab));
                         }
                     })
                     .build();