diff --git a/app/src/main/java/eu/faircode/email/EmailProvider.java b/app/src/main/java/eu/faircode/email/EmailProvider.java
index 03a25a3e2d..708526c0b7 100644
--- a/app/src/main/java/eu/faircode/email/EmailProvider.java
+++ b/app/src/main/java/eu/faircode/email/EmailProvider.java
@@ -227,7 +227,12 @@ public class EmailProvider implements Parcelable {
provider.description = xml.getAttributeValue(null, "description");
if (provider.description == null)
provider.description = provider.name;
- provider.enabled = getAttributeBooleanValue(xml, "enabled", true);
+
+ String enabled = xml.getAttributeValue(null, "enabled");
+ if ("debug".equals(enabled))
+ provider.enabled = BuildConfig.DEBUG;
+ else
+ provider.enabled = getAttributeBooleanValue(xml, "enabled", true);
String domain = xml.getAttributeValue(null, "domain");
if (domain != null)
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index c5fad1a226..6ffff137e2 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -187,8 +187,8 @@
-
-
+ starttls="false" />