diff --git a/FAQ.md b/FAQ.md
index 717d540790..1801877939 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -3858,6 +3858,9 @@ so you cannot use FairEmail or any other email client to access Tutanota.
 and [does not support IMAP](https://www.skiff.com/blog/tutanota-alternatives-comparison)
 so you cannot use FairEmail or any other email client to access Skiff.
 
+**Tildamail** uses a proprietary email protocol and does not support IMAP,
+so you cannot use FairEmail or any other email client to access Tildamail.
+
 <br />
 
 <a name="faq130"></a>
diff --git a/app/src/main/java/eu/faircode/email/EmailProvider.java b/app/src/main/java/eu/faircode/email/EmailProvider.java
index 3281cf9a24..922d8b32e0 100644
--- a/app/src/main/java/eu/faircode/email/EmailProvider.java
+++ b/app/src/main/java/eu/faircode/email/EmailProvider.java
@@ -117,7 +117,10 @@ public class EmailProvider implements Parcelable {
             "tutamail.com", // tutanota
             "tuta.io", // tutanota
             "keemail.me", // tutanota
-            "ctemplar.com"
+            "ctemplar.com",
+            "cyberfear.com",
+            "skiff.com",
+            "tildamail.com"
     ));
 
     private EmailProvider() {