From 087a74e8061a8ec615f8b411b02929c01b873fe4 Mon Sep 17 00:00:00 2001
From: Marcel Bokhorst <M66B@users.noreply.github.com>
Date: Sat, 18 Jan 2020 14:58:46 +0100
Subject: [PATCH 1/3] Update providers.xml

Added domain @magenta.de/@t-online.de
---
 app/src/main/res/xml/providers.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index 5546d2c669..b0bfe32677 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -249,6 +249,7 @@
     </provider>
     <provider
         name="T-Online.de"
+        domain="magenta\\.de,t-online\\.de"
         link="https://www.telekom.de/hilfe/festnetz-internet-tv/e-mail/e-mail-server-e-mail-protokolle-und-e-mail-einrichtung/imap/einrichtung-imap">
         <imap
             host="secureimap.t-online.de"

From c75c6c9a3be82d0322d45117a12ec648c5fba748 Mon Sep 17 00:00:00 2001
From: Marcel Bokhorst <M66B@users.noreply.github.com>
Date: Sat, 18 Jan 2020 15:03:00 +0100
Subject: [PATCH 2/3] Update FAQ.md

Updated FAQ
---
 FAQ.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FAQ.md b/FAQ.md
index 6eb6e38eb2..ca04de94b9 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1216,7 +1216,7 @@ You can change this in the connection settings.
 There are several possible causes, so please read to the end of this answer.
 
 The error '*Handshake failed ... WRONG_VERSION_NUMBER*' might mean that you are trying to connect to an IMAP or SMTP server
-without an encrypted connection, typically using port 143 (IMAP) and port 25 (SMTP).
+without an encrypted connection, typically using port 143 (IMAP) and port 25 (SMTP) or that a wrong protocol (SSL/TLS or STARTTLS) is being used.
 
 Most providers provide encrypted connections using different ports, typically port 993 (IMAP) and port 465/587 (SMTP).
 

From aa726559e68115dd57484434c1e14dafbd8343fc Mon Sep 17 00:00:00 2001
From: Marcel Bokhorst <M66B@users.noreply.github.com>
Date: Sat, 18 Jan 2020 15:04:07 +0100
Subject: [PATCH 3/3] Update FAQ.md

Updated FAQ
---
 FAQ.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FAQ.md b/FAQ.md
index ca04de94b9..29713ed965 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1216,7 +1216,7 @@ You can change this in the connection settings.
 There are several possible causes, so please read to the end of this answer.
 
 The error '*Handshake failed ... WRONG_VERSION_NUMBER*' might mean that you are trying to connect to an IMAP or SMTP server
-without an encrypted connection, typically using port 143 (IMAP) and port 25 (SMTP) or that a wrong protocol (SSL/TLS or STARTTLS) is being used.
+without an encrypted connection, typically using port 143 (IMAP) and port 25 (SMTP), or that a wrong protocol (SSL/TLS or STARTTLS) is being used.
 
 Most providers provide encrypted connections using different ports, typically port 993 (IMAP) and port 465/587 (SMTP).