diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html
new file mode 100644
index 00000000..890f8b62
--- /dev/null
+++ b/_includes/sections/email-providers.html
@@ -0,0 +1,220 @@
+ Privacy-Conscious Email Providers - No Affiliates
+
+
+
All providers listed here are operating outside the US and support SMTP TLS. The table is sortable. Never trust any company with your privacy, always encrypt.
+
Interesting Email Providers Under Development
+
+
+ - Confidant Mail - An open-source non-SMTP cryptographic email system optimized for large file attachments. It is a secure and spam-resistant alternative to regular email and online file drop services. It
+ uses GNU Privacy Guard (GPG) for content encryption and authentication, and TLS 1.2 with ephemeral keys for transport encryption.
+
Become Your Own Email Provider with Mail-in-a-Box
+
+Take it a step further and get control of your email with this easy-to-deploy mail server in a box. Mail-in-a-Box lets you become your own mail service provider in a few easy steps. It's sort of like making your own Gmail, but one you control from top
+to bottom. Technically, Mail-in-a-Box turns a fresh cloud computer into a working mail server. But you don't need to be a technology expert to set it up. More: https://mailinabox.email/
+
+Privacy Email Tools
+
+
+ - gpg4usb - A very easy to use and small portable editor to encrypt and decrypt any text-message or -file. For Windows and Linux. GPG tutorial.
+ - Mailvelope - A browser extension that enables the exchange of encrypted emails following the OpenPGP encryption standard.
+ - Enigmail - A security extension to Thunderbird and Seamonkey. It enables you to write and receive email messages signed and/or encrypted with the OpenPGP standard.
+ - TorBirdy - This extension configures Thunderbird to make connections over the Tor anonymity network.
+ - Email Privacy Tester - This tool will send an Email to your address and perform privacy-related tests.
+
+
+Related Information
+
+
+ - Aging 'Privacy' Law Leaves Cloud E-Mail Open to Cops - Data stored in the cloud for longer than 6 months is considered abandoned and may be accessed by intelligence agencies without
+ a warrant. Learning: Use an external email client like Thunderbird or Enigmail, download your emails and store them locally. Never leave them on the server.
+ - With May First/Riseup Server Seizure, FBI Overreaches Yet Again
+ - Autistici/Inventati server compromised - The cryptographic services offered by the Autistici/Inventati server have been compromised on 15th June 2004. It was discovered on 21st June 2005. One year
+ later. During an enquiry on a single mailbox, the Postal Police may have tapped for a whole year every user's private communication going through the server autistici.org/inventati.org.
+
diff --git a/index.html b/index.html
index 975ccb8c..fd3d56d0 100644
--- a/index.html
+++ b/index.html
@@ -23,223 +23,7 @@ layout: default
{% include sections/browser-tweaks.html %}
- Privacy-Conscious Email Providers - No Affiliates
-
-
-
All providers listed here are operating outside the US and support SMTP TLS. The table is sortable. Never trust any company with your privacy, always encrypt.
-
Interesting Email Providers Under Development
-
- - Confidant Mail - An open-source non-SMTP cryptographic email system optimized for large file attachments. It is a secure and spam-resistant alternative to regular email and online file drop services. It
- uses GNU Privacy Guard (GPG) for content encryption and authentication, and TLS 1.2 with ephemeral keys for transport encryption.
-
Become Your Own Email Provider with Mail-in-a-Box
-
- Take it a step further and get control of your email with this easy-to-deploy mail server in a box. Mail-in-a-Box lets you become your own mail service provider in a few easy steps. It's sort of like making your own Gmail, but one you control from top
- to bottom. Technically, Mail-in-a-Box turns a fresh cloud computer into a working mail server. But you don't need to be a technology expert to set it up. More: https://mailinabox.email/
-
- Privacy Email Tools
-
- - gpg4usb - A very easy to use and small portable editor to encrypt and decrypt any text-message or -file. For Windows and Linux. GPG tutorial.
- - Mailvelope - A browser extension that enables the exchange of encrypted emails following the OpenPGP encryption standard.
- - Enigmail - A security extension to Thunderbird and Seamonkey. It enables you to write and receive email messages signed and/or encrypted with the OpenPGP standard.
- - TorBirdy - This extension configures Thunderbird to make connections over the Tor anonymity network.
- - Email Privacy Tester - This tool will send an Email to your address and perform privacy-related tests.
-
-
- Related Information
-
- - Aging 'Privacy' Law Leaves Cloud E-Mail Open to Cops - Data stored in the cloud for longer than 6 months is considered abandoned and may be accessed by intelligence agencies without
- a warrant. Learning: Use an external email client like Thunderbird or Enigmail, download your emails and store them locally. Never leave them on the server.
- - With May First/Riseup Server Seizure, FBI Overreaches Yet Again
- - Autistici/Inventati server compromised - The cryptographic services offered by the Autistici/Inventati server have been compromised on 15th June 2004. It was discovered on 21st June 2005. One year
- later. During an enquiry on a single mailbox, the Postal Police may have tapped for a whole year every user's private communication going through the server autistici.org/inventati.org.
-
+ {% include sections/email-providers.html %}
Email Clients
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+
+ 
+ 
+ 
+