diff --git a/docs/device-integrity.md b/docs/device-integrity.md
index c72494344a..bda091e04e 100644
--- a/docs/device-integrity.md
+++ b/docs/device-integrity.md
@@ -7,9 +7,12 @@ cover: device-integrity.webp
These tools can be used to validate the integrity of your mobile devices and check them for indicators of compromise by spyware and malware such as Pegasus, Predator, or KingsPawn. This page focuses on **mobile security**, because mobile devices typically have read-only systems with well-known configurations, so detecting malicious modifications is easier than on traditional desktop systems. We may expand the focus of this page in the future.
-!!! note "This is an advanced topic"
+
+
This is an advanced topic
- These tools may provide utility for certain individuals. They provide functionality which most people do not need to worry about, and often require more in-depth technical knowledge to use effectively.
+These tools may provide utility for certain individuals. They provide functionality which most people do not need to worry about, and often require more in-depth technical knowledge to use effectively.
+
+
It is **critical** to understand that scanning your device for public indicators of compromise is **not sufficient** to determine that a device is "clean", and not targeted with a particular spyware tool. Reliance on these publicly-available scanning tools can miss recent security developments and give you a false sense of security.
@@ -44,35 +47,46 @@ These tools provide analysis based on the information they have the ability to a
External verification tools run on your computer and scan your mobile device for forensic traces which are helpful to identify potential compromise.
-!!! danger
+
+
Danger
+
+Public indicators of compromise are insufficient to determine that a device is "clean", and not targeted with a particular spyware tool. Reliance on public indicators alone can miss recent forensic traces and give a false sense of security.
- Public indicators of compromise are insufficient to determine that a device is "clean", and not targeted with a particular spyware tool. Reliance on public indicators alone can miss recent forensic traces and give a false sense of security.
+Reliable and comprehensive digital forensic support and triage requires access to non-public indicators, research and threat intelligence.
- Reliable and comprehensive digital forensic support and triage requires access to non-public indicators, research and threat intelligence.
+Such support is available to civil society through [Amnesty International's Security Lab](https://www.amnesty.org/en/tech/) or [Access Now’s Digital Security Helpline](https://www.accessnow.org/help/).
- Such support is available to civil society through [Amnesty International's Security Lab](https://www.amnesty.org/en/tech/) or [Access Now’s Digital Security Helpline](https://www.accessnow.org/help/).
+
These tools can trigger false-positives. If any of these tools finds indicators of compromise, you need to dig deeper to determine your actual risk. Some reports may be false positives based on websites you've visited in the past, and findings which are many years old are likely either false-positives or indicate previous (and no longer active) compromise.
### Mobile Verification Toolkit
-!!! recommendation
+
+
+![MVT logo](assets/img/device-integrity/mvt.webp){ align=right }
+
+**Mobile Verification Toolkit** (**MVT**) is a collection of utilities which simplifies and automates the process of scanning mobile devices for potential traces of targeting or infection by known spyware campaigns. MVT was developed by Amnesty International and released in 2021 in the context of the [Pegasus Project](https://forbiddenstories.org/about-the-pegasus-project/).
- ![MVT logo](assets/img/device-integrity/mvt.webp){ align=right }
+[:octicons-home-16: Homepage](https://mvt.re/){ .md-button .md-button--primary }
+[:octicons-code-16:](https://github.com/mvt-project/mvt){ .card-link title="Source Code" }
- **Mobile Verification Toolkit** (**MVT**) is a collection of utilities which simplifies and automates the process of scanning mobile devices for potential traces of targeting or infection by known spyware campaigns. MVT was developed by Amnesty International and released in 2021 in the context of the [Pegasus Project](https://forbiddenstories.org/about-the-pegasus-project/).
+
+Downloads
- [:octicons-home-16: Homepage](https://mvt.re/){ .md-button .md-button--primary }
- [:octicons-code-16:](https://github.com/mvt-project/mvt){ .card-link title="Source Code" }
+- [:simple-apple: macOS](https://docs.mvt.re/en/latest/install/)
+- [:simple-linux: Linux](https://docs.mvt.re/en/latest/install/)
- ??? downloads
+
- - [:simple-apple: macOS](https://docs.mvt.re/en/latest/install/)
- - [:simple-linux: Linux](https://docs.mvt.re/en/latest/install/)
+
-!!! warning
+
+
Warning
- Using MVT is insufficient to determine that a device is "clean", and not targeted with a particular spyware tool.
+Using MVT is insufficient to determine that a device is "clean", and not targeted with a particular spyware tool.
+
+
MVT is *most* useful for scanning iOS devices. Android stores very little diagnostic information useful to triage potential compromises, and because of this `mvt-android` capabilities are limited as well. On the other hand, encrypted iOS iTunes backups provide a large enough subset of files stored on the device to detect suspicious artifacts in many cases. This being said, MVT does still provide fairly useful tools for both iOS and Android analysis.
@@ -89,20 +103,25 @@ MVT allows you to perform deeper scans/analysis if your device is jailbroken. Un
### iMazing (iOS)
-!!! recommendation
+
+
+![iMazing logo](assets/img/device-integrity/imazing.png){ align=right }
- ![iMazing logo](assets/img/device-integrity/imazing.png){ align=right }
+**iMazing** provides a free spyware analyzer tool for iOS devices which acts as a GUI-wrapper for [MVT](#mobile-verification-toolkit). This can be much easier to run compared to MVT itself, which is a command-line tool designed for technologists and forensic investigators.
- **iMazing** provides a free spyware analyzer tool for iOS devices which acts as a GUI-wrapper for [MVT](#mobile-verification-toolkit). This can be much easier to run compared to MVT itself, which is a command-line tool designed for technologists and forensic investigators.
+[:octicons-home-16: Homepage](https://imazing.com/){ .md-button .md-button--primary }
+[:octicons-eye-16:](https://imazing.com/privacy-policy){ .card-link title="Privacy Policy" }
+[:octicons-info-16:](https://imazing.com/spyware-analyzer){ .card-link title=Documentation}
- [:octicons-home-16: Homepage](https://imazing.com/){ .md-button .md-button--primary }
- [:octicons-eye-16:](https://imazing.com/privacy-policy){ .card-link title="Privacy Policy" }
- [:octicons-info-16:](https://imazing.com/spyware-analyzer){ .card-link title=Documentation}
+
+Downloads
- ??? downloads
+- [:simple-windows11: Windows](https://imazing.com/download)
+- [:simple-apple: macOS](https://imazing.com/download)
- - [:simple-windows11: Windows](https://imazing.com/download)
- - [:simple-apple: macOS](https://imazing.com/download)
+
+
+
iMazing automates and interactively guides you through the process of using [MVT](#mobile-verification-toolkit) to scan your device for publicly-accessible indicators of compromise published by various threat researchers. All of the information and warnings which apply to MVT apply to this tool as well, so we suggest you also familiarize yourself with the notes on MVT in the sections above.
@@ -110,30 +129,38 @@ iMazing automates and interactively guides you through the process of using [MVT
These are apps you can install which check your device and operating system for signs of tampering, and validate the identity of your device.
-!!! warning
+
+
Warning
+
+Using these apps is insufficient to determine that a device is "clean", and not targeted with a particular spyware tool.
- Using these apps is insufficient to determine that a device is "clean", and not targeted with a particular spyware tool.
+
### Auditor (Android)
-!!! recommendation
+
- ![Auditor logo](assets/img/device-integrity/auditor.svg#only-light){ align=right }
- ![Auditor logo](assets/img/device-integrity/auditor-dark.svg#only-dark){ align=right }
+![Auditor logo](assets/img/device-integrity/auditor.svg#only-light){ align=right }
+![Auditor logo](assets/img/device-integrity/auditor-dark.svg#only-dark){ align=right }
- **Auditor** is an app which leverages hardware security features to provide device integrity monitoring by actively validating the identity of a device and the integrity of its operating system. Currently, it only works with GrapheneOS or the stock operating system for [supported devices](https://attestation.app/about#device-support).
+**Auditor** is an app which leverages hardware security features to provide device integrity monitoring by actively validating the identity of a device and the integrity of its operating system. Currently, it only works with GrapheneOS or the stock operating system for [supported devices](https://attestation.app/about#device-support).
- [:octicons-home-16: Homepage](https://attestation.app){ .md-button .md-button--primary }
- [:octicons-eye-16:](https://attestation.app/privacy-policy){ .card-link title="Privacy Policy" }
- [:octicons-info-16:](https://attestation.app/about){ .card-link title=Documentation}
- [:octicons-code-16:](https://attestation.app/source){ .card-link title="Source Code" }
- [:octicons-heart-16:](https://attestation.app/donate){ .card-link title=Contribute }
+[:octicons-home-16: Homepage](https://attestation.app){ .md-button .md-button--primary }
+[:octicons-eye-16:](https://attestation.app/privacy-policy){ .card-link title="Privacy Policy" }
+[:octicons-info-16:](https://attestation.app/about){ .card-link title=Documentation}
+[:octicons-code-16:](https://attestation.app/source){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://attestation.app/donate){ .card-link title=Contribute }
- ??? downloads
+
+Downloads
- - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=app.attestation.auditor.play)
- - [:simple-github: GitHub](https://github.com/GrapheneOS/Auditor/releases)
- - [:material-cube-outline: GrapheneOS App Store](https://github.com/GrapheneOS/Apps/releases)
+- [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=app.attestation.auditor.play)
+- [:simple-github: GitHub](https://github.com/GrapheneOS/Auditor/releases)
+- [:material-cube-outline: GrapheneOS App Store](https://github.com/GrapheneOS/Apps/releases)
+
+
+
+
Auditor is not a scanning/analysis tool like some other tools on this page, rather it uses your device's hardware-backed keystore to allow you to verify the identity of your device and gain assurance that the operating system itself hasn't been tampered with or downgraded via verified boot. This provides a very robust integrity check of your device itself, but doesn't necessarily check whether the user-level apps running on your device are malicious.
@@ -155,45 +182,58 @@ If your [threat model](basics/threat-modeling.md) requires privacy, you could co
These are apps you can install on your device which scan your device for signs of compromise.
-!!! warning
+
+
Warning
- Using these apps is insufficient to determine that a device is "clean", and not targeted with a particular spyware tool.
+Using these apps is insufficient to determine that a device is "clean", and not targeted with a particular spyware tool.
+
+
### Hypatia (Android)
-!!! recommendation
+
+
+![Hypatia logo](assets/img/device-integrity/hypatia.svg#only-light){ align=right }
+![Hypatia logo](assets/img/device-integrity/hypatia-dark.svg#only-dark){ align=right }
- ![Hypatia logo](assets/img/device-integrity/hypatia.svg#only-light){ align=right }
- ![Hypatia logo](assets/img/device-integrity/hypatia-dark.svg#only-dark){ align=right }
+**Hypatia** is an open source real-time malware scanner for Android, from the developer of [DivestOS](android.md#divestos). It accesses the internet to download signature database updates, but does not upload your files or any metadata to the cloud (scans are performed entirely locally).
- **Hypatia** is an open source real-time malware scanner for Android, from the developer of [DivestOS](android.md#divestos). It accesses the internet to download signature database updates, but does not upload your files or any metadata to the cloud (scans are performed entirely locally).
+[:octicons-home-16: Homepage](https://divestos.org/pages/our_apps#hypatia){ .md-button .md-button--primary }
+[:octicons-eye-16:](https://divestos.org/pages/privacy_policy#hypatia){ .card-link title="Privacy Policy" }
+[:octicons-code-16:](https://github.com/divested-mobile/hypatia){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://divested.dev/pages/donate){ .card-link title=Contribute }
- [:octicons-home-16: Homepage](https://divestos.org/pages/our_apps#hypatia){ .md-button .md-button--primary }
- [:octicons-eye-16:](https://divestos.org/pages/privacy_policy#hypatia){ .card-link title="Privacy Policy" }
- [:octicons-code-16:](https://github.com/divested-mobile/hypatia){ .card-link title="Source Code" }
- [:octicons-heart-16:](https://divested.dev/pages/donate){ .card-link title=Contribute }
+
+Downloads
- ??? downloads
+- [:simple-android: F-Droid](https://f-droid.org/packages/us.spotco.malwarescanner/)
- - [:simple-android: F-Droid](https://f-droid.org/packages/us.spotco.malwarescanner/)
+
+
+
Hypatia is particularly good at detecting common stalkerware: If you suspect you are a victim of stalkerware, you should [visit this page](https://stopstalkerware.org/information-for-survivors/) for advice.
### iVerify (iOS)
-!!! recommendation
+
+
+![iVerify logo](assets/img/device-integrity/iverify.webp){ align=right }
+
+**iVerify** is an iOS app which automatically scans your device to check configuration settings, patch level, and other areas of security. It also checks your device for indicators of compromise by jailbreak tools or spyware such as Pegasus.
- ![iVerify logo](assets/img/device-integrity/iverify.webp){ align=right }
+[:octicons-home-16: Homepage](https://www.iverify.io/consumer){ .md-button .md-button--primary }
+[:octicons-eye-16:](https://www.iverify.io/privacy-policy){ .card-link title="Privacy Policy" }
+[:octicons-info-16:](https://www.iverify.io/frequently-asked-questions#iVerify-General){ .card-link title=Documentation}
- **iVerify** is an iOS app which automatically scans your device to check configuration settings, patch level, and other areas of security. It also checks your device for indicators of compromise by jailbreak tools or spyware such as Pegasus.
+
+Downloads
- [:octicons-home-16: Homepage](https://www.iverify.io/consumer){ .md-button .md-button--primary }
- [:octicons-eye-16:](https://www.iverify.io/privacy-policy){ .card-link title="Privacy Policy" }
- [:octicons-info-16:](https://www.iverify.io/frequently-asked-questions#iVerify-General){ .card-link title=Documentation}
+- [:simple-appstore: App Store](https://apps.apple.com/us/app/iverify/id1466120520)
- ??? downloads
+
- - [:simple-appstore: App Store](https://apps.apple.com/us/app/iverify/id1466120520)
+
Like all iOS apps, iVerify is restricted to what it can observe about your device from within the iOS App Sandbox. It will not provide nearly as robust analysis as a full-system analysis tool like [MVT](#mobile-verification-toolkit). Its primary function is to detect whether your device is jailbroken, which it is effective at, however a hypothetical threat which is *specifically* designed to bypass iVerify's checks would likely succeed at doing so.
diff --git a/docs/email.md b/docs/email.md
index a0aec356b8..b029351709 100644
--- a/docs/email.md
+++ b/docs/email.md
@@ -28,35 +28,43 @@ These providers natively support OpenPGP encryption/decryption and the [Web Key
-!!! warning
+
+
Warning
- When using E2EE technology like OpenPGP your email will still have some metadata that is not encrypted in the header of the email, generally including the subject line! Read more about [email metadata](basics/email-security.md#email-metadata-overview).
+When using E2EE technology like OpenPGP your email will still have some metadata that is not encrypted in the header of the email, generally including the subject line! Read more about [email metadata](basics/email-security.md#email-metadata-overview).
- OpenPGP also does not support Forward secrecy, which means if either your or the recipient's private key is ever stolen, all previous messages encrypted with it will be exposed. [How do I protect my private keys?](basics/email-security.md#how-do-i-protect-my-private-keys)
+OpenPGP also does not support Forward secrecy, which means if either your or the recipient's private key is ever stolen, all previous messages encrypted with it will be exposed. [How do I protect my private keys?](basics/email-security.md#how-do-i-protect-my-private-keys)
+
+
### Proton Mail
-!!! recommendation
+
+
+![Proton Mail logo](assets/img/email/protonmail.svg){ align=right }
- ![Proton Mail logo](assets/img/email/protonmail.svg){ align=right }
+**Proton Mail** is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since **2013**. Proton AG is based in Genève, Switzerland. Accounts start with 500 MB storage with their free plan.
- **Proton Mail** is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since **2013**. Proton AG is based in Genève, Switzerland. Accounts start with 500 MB storage with their free plan.
+[:octicons-home-16: Homepage](https://proton.me/mail){ .md-button .md-button--primary }
+[:simple-torbrowser:](https://protonmailrmez3lotccipshtkleegetolb73fuirgj7r4o4vfu7ozyd.onion){ .card-link title="Onion Service" }
+[:octicons-eye-16:](https://proton.me/legal/privacy){ .card-link title="Privacy Policy" }
+[:octicons-info-16:](https://proton.me/support/mail){ .card-link title=Documentation}
+[:octicons-code-16:](https://github.com/ProtonMail){ .card-link title="Source Code" }
- [:octicons-home-16: Homepage](https://proton.me/mail){ .md-button .md-button--primary }
- [:simple-torbrowser:](https://protonmailrmez3lotccipshtkleegetolb73fuirgj7r4o4vfu7ozyd.onion){ .card-link title="Onion Service" }
- [:octicons-eye-16:](https://proton.me/legal/privacy){ .card-link title="Privacy Policy" }
- [:octicons-info-16:](https://proton.me/support/mail){ .card-link title=Documentation}
- [:octicons-code-16:](https://github.com/ProtonMail){ .card-link title="Source Code" }
+
+Downloads
- ??? downloads
+- [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=ch.protonmail.android)
+- [:simple-appstore: App Store](https://apps.apple.com/app/apple-store/id979659905)
+- [:simple-github: GitHub](https://github.com/ProtonMail/proton-mail-android/releases)
+- [:simple-windows11: Windows](https://proton.me/mail/bridge#download)
+- [:simple-apple: macOS](https://proton.me/mail/bridge#download)
+- [:simple-linux: Linux](https://proton.me/mail/bridge#download)
+- [:octicons-browser-16: Web](https://mail.proton.me)
- - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=ch.protonmail.android)
- - [:simple-appstore: App Store](https://apps.apple.com/app/apple-store/id979659905)
- - [:simple-github: GitHub](https://github.com/ProtonMail/proton-mail-android/releases)
- - [:simple-windows11: Windows](https://proton.me/mail/bridge#download)
- - [:simple-apple: macOS](https://proton.me/mail/bridge#download)
- - [:simple-linux: Linux](https://proton.me/mail/bridge#download)
- - [:octicons-browser-16: Web](https://mail.proton.me)
+
+
+
Free accounts have some limitations, such as not being able to search body text and not having access to [Proton Mail Bridge](https://proton.me/mail/bridge), which is required to use a [recommended desktop email client](email-clients.md) (e.g. Thunderbird). Paid accounts include features like Proton Mail Bridge, additional storage, and custom domain support. A [letter of attestation](https://proton.me/blog/security-audit-all-proton-apps) was provided for Proton Mail's apps on 9th November 2021 by [Securitum](https://research.securitum.com).
@@ -100,22 +108,27 @@ Proton Mail doesn't offer a digital legacy feature.
### Skiff Mail
-!!! recommendation
+
+
+![Skiff Mail logo](assets/img/email/skiff-mail.svg){ align=right }
- ![Skiff Mail logo](assets/img/email/skiff-mail.svg){ align=right }
+**Skiff Mail** is a web based email service with E2EE that began in 2020 that is based in San Francisco with developers worldwide. Accounts start with 10GB of free storage.
- **Skiff Mail** is a web based email service with E2EE that began in 2020 that is based in San Francisco with developers worldwide. Accounts start with 10GB of free storage.
+[:octicons-home-16: Homepage](https://skiff.com/mail){ .md-button .md-button--primary }
+[:octicons-eye-16:](https://app.skiff.com/docs/db93c237-84c2-4b2b-9588-19a7cd2cd45a#tyGksN9rkqbo2uGYASxsA6HVLjUoly/wTYK8tncTto8=){ .card-link title="Privacy Policy" }
+[:octicons-info-16:](https://skiff.com/help){ .card-link title=Documentation}
+[:octicons-code-16:](https://github.com/skiff-org/skiff-apps){ .card-link title="Source Code" }
- [:octicons-home-16: Homepage](https://skiff.com/mail){ .md-button .md-button--primary }
- [:octicons-eye-16:](https://app.skiff.com/docs/db93c237-84c2-4b2b-9588-19a7cd2cd45a#tyGksN9rkqbo2uGYASxsA6HVLjUoly/wTYK8tncTto8=){ .card-link title="Privacy Policy" }
- [:octicons-info-16:](https://skiff.com/help){ .card-link title=Documentation}
- [:octicons-code-16:](https://github.com/skiff-org/skiff-apps){ .card-link title="Source Code" }
+
+Downloads
- ??? downloads
+- [:simple-android: Android](https://play.google.com/store/apps/details?id=com.skemailmobileapp&pli=1)
+- [:simple-appstore: iOS](https://apps.apple.com/us/app/skiff-mail/id1619168801)
+- [:octicons-browser-16: Web](https://app.skiff.com/mail)
- - [:simple-android: Android](https://play.google.com/store/apps/details?id=com.skemailmobileapp&pli=1)
- - [:simple-appstore: iOS](https://apps.apple.com/us/app/skiff-mail/id1619168801)
- - [:octicons-browser-16: Web](https://app.skiff.com/mail)
+
+
+
Skiff has undergone a few [audits](https://skiff.com/transparency) during its development.
@@ -155,19 +168,24 @@ Skiff Mail does not offer a digital legacy feature.
### Mailbox.org
-!!! recommendation
+
+
+![Mailbox.org logo](assets/img/email/mailboxorg.svg){ align=right }
- ![Mailbox.org logo](assets/img/email/mailboxorg.svg){ align=right }
+**Mailbox.org** is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since 2014. Mailbox.org is based in Berlin, Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.
- **Mailbox.org** is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since 2014. Mailbox.org is based in Berlin, Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.
+[:octicons-home-16: Homepage](https://mailbox.org){ .md-button .md-button--primary }
+[:octicons-eye-16:](https://mailbox.org/en/data-protection-privacy-policy){ .card-link title="Privacy Policy" }
+[:octicons-info-16:](https://kb.mailbox.org/en/private){ .card-link title=Documentation}
- [:octicons-home-16: Homepage](https://mailbox.org){ .md-button .md-button--primary }
- [:octicons-eye-16:](https://mailbox.org/en/data-protection-privacy-policy){ .card-link title="Privacy Policy" }
- [:octicons-info-16:](https://kb.mailbox.org/en/private){ .card-link title=Documentation}
+
+Downloads
- ??? downloads
+- [:octicons-browser-16: Web](https://login.mailbox.org)
- - [:octicons-browser-16: Web](https://login.mailbox.org)
+
+
+
#### :material-check:{ .pg-green } Custom Domains and Aliases
@@ -217,27 +235,32 @@ These providers store your emails with zero-knowledge encryption, making them gr
### Tuta
-!!! recommendation
+
+
+![Tuta logo](assets/img/email/tuta.svg){ align=right }
- ![Tuta logo](assets/img/email/tuta.svg){ align=right }
+**Tuta** is an email service with a focus on security and privacy through the use of encryption. Tuta has been in operation since **2011** and is based in Hanover, Germany. Accounts start with 1GB storage with their free plan.
- **Tuta** is an email service with a focus on security and privacy through the use of encryption. Tuta has been in operation since **2011** and is based in Hanover, Germany. Accounts start with 1GB storage with their free plan.
+[:octicons-home-16: Homepage](https://tuta.com){ .md-button .md-button--primary }
+[:octicons-eye-16:](https://tuta.com/privacy){ .card-link title="Privacy Policy" }
+[:octicons-info-16:](https://tuta.com/faq){ .card-link title=Documentation}
+[:octicons-code-16:](https://github.com/tutao/tutanota){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://tuta.com/community/){ .card-link title=Contribute }
- [:octicons-home-16: Homepage](https://tuta.com){ .md-button .md-button--primary }
- [:octicons-eye-16:](https://tuta.com/privacy){ .card-link title="Privacy Policy" }
- [:octicons-info-16:](https://tuta.com/faq){ .card-link title=Documentation}
- [:octicons-code-16:](https://github.com/tutao/tutanota){ .card-link title="Source Code" }
- [:octicons-heart-16:](https://tuta.com/community/){ .card-link title=Contribute }
+
+Downloads
- ??? downloads
+- [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=de.tutao.tutanota)
+- [:simple-appstore: App Store](https://apps.apple.com/app/tutanota/id922429609)
+- [:simple-github: GitHub](https://github.com/tutao/tutanota/releases)
+- [:simple-windows11: Windows](https://tuta.com/#download)
+- [:simple-apple: macOS](https://tuta.com/#download)
+- [:simple-linux: Linux](https://tuta.com/#download)
+- [:octicons-browser-16: Web](https://app.tuta.com/)
- - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=de.tutao.tutanota)
- - [:simple-appstore: App Store](https://apps.apple.com/app/tutanota/id922429609)
- - [:simple-github: GitHub](https://github.com/tutao/tutanota/releases)
- - [:simple-windows11: Windows](https://tuta.com/#download)
- - [:simple-apple: macOS](https://tuta.com/#download)
- - [:simple-linux: Linux](https://tuta.com/#download)
- - [:octicons-browser-16: Web](https://app.tuta.com/)
+
+
+
Tuta doesn't support the [IMAP protocol](https://tuta.com/faq/#imap) or the use of third-party [email clients](email-clients.md), and you also won't be able to add [external email accounts](https://github.com/tutao/tutanota/issues/544#issuecomment-670473647) to the Tuta app. [Email import](https://github.com/tutao/tutanota/issues/630) is not currently supported either, though this is [due to be changed](https://tuta.com/blog/posts/kickoff-import). Emails can be exported [individually or by bulk selection](https://tuta.com/howto#generalMail) per folder, which may be inconvenient if you have many folders.
@@ -303,25 +326,30 @@ Using an aliasing service requires trusting both your email provider and your al
### addy.io
-!!! recommendation
+
+
+![addy.io logo](assets/img/email/addy.svg#only-light){ align=right }
+![addy.io logo](assets/img/email/addy-dark.svg#only-dark){ align=right }
- ![addy.io logo](assets/img/email/addy.svg#only-light){ align=right }
- ![addy.io logo](assets/img/email/addy-dark.svg#only-dark){ align=right }
+**addy.io** lets you create 10 domain aliases on a shared domain for free, or unlimited "standard" aliases which are less anonymous.
- **addy.io** lets you create 10 domain aliases on a shared domain for free, or unlimited "standard" aliases which are less anonymous.
+[:octicons-home-16: Homepage](https://addy.io){ .md-button .md-button--primary }
+[:octicons-eye-16:](https://addy.io/privacy){ .card-link title="Privacy Policy" }
+[:octicons-info-16:](https://app.addy.io/docs){ .card-link title=Documentation}
+[:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://addy.io/donate){ .card-link title=Contribute }
- [:octicons-home-16: Homepage](https://addy.io){ .md-button .md-button--primary }
- [:octicons-eye-16:](https://addy.io/privacy){ .card-link title="Privacy Policy" }
- [:octicons-info-16:](https://app.addy.io/docs){ .card-link title=Documentation}
- [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
- [:octicons-heart-16:](https://addy.io/donate){ .card-link title=Contribute }
+
+Downloads
- ??? downloads
+- [:simple-android: Android](https://addy.io/faq/#is-there-an-android-app)
+- [:material-apple-ios: iOS](https://addy.io/faq/#is-there-an-ios-app)
+- [:simple-firefoxbrowser: Firefox](https://addons.mozilla.org/firefox/addon/addy_io/)
+- [:simple-googlechrome: Chrome](https://chrome.google.com/webstore/detail/addyio-anonymous-email-fo/iadbdpnoknmbdeolbapdackdcogdmjpe)
- - [:simple-android: Android](https://addy.io/faq/#is-there-an-android-app)
- - [:material-apple-ios: iOS](https://addy.io/faq/#is-there-an-ios-app)
- - [:simple-firefoxbrowser: Firefox](https://addons.mozilla.org/firefox/addon/addy_io/)
- - [:simple-googlechrome: Chrome](https://chrome.google.com/webstore/detail/addyio-anonymous-email-fo/iadbdpnoknmbdeolbapdackdcogdmjpe)
+
+
+
The number of shared aliases (which end in a shared domain like @addy.io) that you can create is limited to 10 on addy.io's free plan, 50 on their $1/month plan and unlimited on the $4/month plan (billed $3 for a year). You can create unlimited standard aliases (which end in a domain like @[username].addy.io or a custom domain on paid plans), however, as previously mentioned, this can be detrimental to privacy because people can trivially tie your standard aliases together based on the domain name alone. They are useful where a shared domain might be blocked by a service. Securitum [audited](https://addy.io/blog/addy-io-passes-independent-security-audit/) addy.io in September 2023 and no significant vulnerabilities [were identified](https://addy.io/addy-io-security-audit.pdf).
@@ -335,26 +363,31 @@ Notable free features:
### SimpleLogin
-!!! recommendation
+
+
+![Simplelogin logo](assets/img/email/simplelogin.svg){ align=right }
- ![Simplelogin logo](assets/img/email/simplelogin.svg){ align=right }
+**SimpleLogin** is a free service which provides email aliases on a variety of shared domain names, and optionally provides paid features like unlimited aliases and custom domains.
- **SimpleLogin** is a free service which provides email aliases on a variety of shared domain names, and optionally provides paid features like unlimited aliases and custom domains.
+[:octicons-home-16: Homepage](https://simplelogin.io){ .md-button .md-button--primary }
+[:octicons-eye-16:](https://simplelogin.io/privacy/){ .card-link title="Privacy Policy" }
+[:octicons-info-16:](https://simplelogin.io/docs/){ .card-link title=Documentation}
+[:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
- [:octicons-home-16: Homepage](https://simplelogin.io){ .md-button .md-button--primary }
- [:octicons-eye-16:](https://simplelogin.io/privacy/){ .card-link title="Privacy Policy" }
- [:octicons-info-16:](https://simplelogin.io/docs/){ .card-link title=Documentation}
- [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+Downloads
- ??? downloads
+- [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=io.simplelogin.android)
+- [:simple-appstore: App Store](https://apps.apple.com/app/id1494359858)
+- [:simple-github: GitHub](https://github.com/simple-login/Simple-Login-Android/releases)
+- [:simple-firefoxbrowser: Firefox](https://addons.mozilla.org/firefox/addon/simplelogin/)
+- [:simple-googlechrome: Chrome](https://chrome.google.com/webstore/detail/dphilobhebphkdjbpfohgikllaljmgbn)
+- [:simple-microsoftedge: Edge](https://microsoftedge.microsoft.com/addons/detail/simpleloginreceive-sen/diacfpipniklenphgljfkmhinphjlfff)
+- [:simple-safari: Safari](https://apps.apple.com/app/id1494051017)
- - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=io.simplelogin.android)
- - [:simple-appstore: App Store](https://apps.apple.com/app/id1494359858)
- - [:simple-github: GitHub](https://github.com/simple-login/Simple-Login-Android/releases)
- - [:simple-firefoxbrowser: Firefox](https://addons.mozilla.org/firefox/addon/simplelogin/)
- - [:simple-googlechrome: Chrome](https://chrome.google.com/webstore/detail/dphilobhebphkdjbpfohgikllaljmgbn)
- - [:simple-microsoftedge: Edge](https://microsoftedge.microsoft.com/addons/detail/simpleloginreceive-sen/diacfpipniklenphgljfkmhinphjlfff)
- - [:simple-safari: Safari](https://apps.apple.com/app/id1494051017)
+
+
+
SimpleLogin was [acquired by Proton AG](https://proton.me/news/proton-and-simplelogin-join-forces) as of April 8, 2022. If you use Proton Mail for your primary mailbox, SimpleLogin is a great choice. As both products are now owned by the same company you now only have to trust a single entity. We also expect that SimpleLogin will be more tightly integrated with Proton's offerings in the future. SimpleLogin continues to support forwarding to any email provider of your choosing. Securitum [audited](https://simplelogin.io/blog/security-audit/) SimpleLogin in early 2022 and all issues [were addressed](https://simplelogin.io/audit2022/web.pdf).
@@ -374,26 +407,30 @@ Advanced system administrators may consider setting up their own email server. M
### Combined software solutions
-!!! recommendation
+
+
+![Mailcow logo](assets/img/email/mailcow.svg){ align=right }
- ![Mailcow logo](assets/img/email/mailcow.svg){ align=right }
+**Mailcow** is a more advanced mail server perfect for those with a bit more Linux experience. It has everything you need in a Docker container: A mail server with DKIM support, antivirus and spam monitoring, webmail and ActiveSync with SOGo, and web-based administration with 2FA support.
- **Mailcow** is a more advanced mail server perfect for those with a bit more Linux experience. It has everything you need in a Docker container: A mail server with DKIM support, antivirus and spam monitoring, webmail and ActiveSync with SOGo, and web-based administration with 2FA support.
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailcow.github.io/mailcow-dockerized-docs/){ .card-link title=Documentation}
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://www.servercow.de/mailcow?lang=en#sal){ .card-link title=Contribute }
- [:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
- [:octicons-info-16:](https://mailcow.github.io/mailcow-dockerized-docs/){ .card-link title=Documentation}
- [:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
- [:octicons-heart-16:](https://www.servercow.de/mailcow?lang=en#sal){ .card-link title=Contribute }
+
+
+
-!!! recommendation
+![Mail-in-a-Box logo](assets/img/email/mail-in-a-box.svg){ align=right }
- ![Mail-in-a-Box logo](assets/img/email/mail-in-a-box.svg){ align=right }
+**Mail-in-a-Box** is an automated setup script for deploying a mail server on Ubuntu. Its goal is to make it easier for people to set up their own mail server.
- **Mail-in-a-Box** is an automated setup script for deploying a mail server on Ubuntu. Its goal is to make it easier for people to set up their own mail server.
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title=Documentation}
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
- [:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
- [:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title=Documentation}
- [:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
For a more manual approach we've picked out these two articles:
diff --git a/docs/photo-management.md b/docs/photo-management.md
index 2a04cb9d37..4222bcb752 100644
--- a/docs/photo-management.md
+++ b/docs/photo-management.md
@@ -8,74 +8,92 @@ Most cloud photo management solutions like Google Photos, Flickr, and Amazon Pho
## ente
-!!! recommendation
+
- ![ente logo](assets/img/photo-management/ente.svg#only-light){ align=right }
- ![ente logo](assets/img/photo-management/ente-dark.svg#only-dark){ align=right }
+![ente logo](assets/img/photo-management/ente.svg#only-light){ align=right }
+![ente logo](assets/img/photo-management/ente-dark.svg#only-dark){ align=right }
- **ente** is an end-to-end encrypted photo backup service which supports automatic backups on iOS and Android. It underwent an [audit by Cure53](https://ente.io/blog/cryptography-audit/) in March 2023.
+**ente** is an end-to-end encrypted photo backup service which supports automatic backups on iOS and Android. It underwent an [audit by Cure53](https://ente.io/blog/cryptography-audit/) in March 2023.
- [:octicons-home-16: Homepage](https://ente.io/){ .md-button .md-button--primary }
- [:octicons-eye-16:](https://ente.io/privacy){ .card-link title="Privacy Policy" }
- [:octicons-info-16:](https://ente.io/faq){ .card-link title=Documentation}
- [:octicons-code-16:](https://github.com/ente-io){ .card-link title="Source Code" }
+[:octicons-home-16: Homepage](https://ente.io/){ .md-button .md-button--primary }
+[:octicons-eye-16:](https://ente.io/privacy){ .card-link title="Privacy Policy" }
+[:octicons-info-16:](https://ente.io/faq){ .card-link title=Documentation}
+[:octicons-code-16:](https://github.com/ente-io){ .card-link title="Source Code" }
- ??? downloads
+
+Downloads
- - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=io.ente.photos)
- - [:simple-android: Android](https://ente.io/download)
- - [:simple-appstore: App Store](https://apps.apple.com/app/id1542026904)
- - [:simple-github: GitHub](https://github.com/ente-io/photos-app/releases)
- - [:simple-windows11: Windows](https://ente.io/download)
- - [:simple-apple: macOS](https://ente.io/download)
- - [:simple-linux: Linux](https://ente.io/download)
- - [:octicons-globe-16: Web](https://web.ente.io)
+- [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=io.ente.photos)
+- [:simple-android: Android](https://ente.io/download)
+- [:simple-appstore: App Store](https://apps.apple.com/app/id1542026904)
+- [:simple-github: GitHub](https://github.com/ente-io/photos-app/releases)
+- [:simple-windows11: Windows](https://ente.io/download)
+- [:simple-apple: macOS](https://ente.io/download)
+- [:simple-linux: Linux](https://ente.io/download)
+- [:octicons-globe-16: Web](https://web.ente.io)
+
+
+
+
## Stingle
-!!! recommendation
+
+
+![Stingle logo](assets/img/photo-management/stingle.png#only-light){ align=right }
+![Stingle logo](assets/img/photo-management/stingle-dark.png#only-dark){ align=right }
+
+**Stingle** is a gallery and camera application with built-in, end-to-end encrypted backup and sync functionality for your photos and videos. Storage starts at 1GB for free accounts on their cloud, or you can host your own Stingle API server for total independence.
- ![Stingle logo](assets/img/photo-management/stingle.png#only-light){ align=right }
- ![Stingle logo](assets/img/photo-management/stingle-dark.png#only-dark){ align=right }
+[:octicons-home-16: Homepage](https://stingle.org/){ .md-button .md-button--primary }
+[:octicons-eye-16:](https://stingle.org/privacy/){ .card-link title="Privacy Policy" }
+[:octicons-info-16:](https://stingle.org/faq/){ .card-link title=Documentation}
+[:octicons-code-16:](https://github.com/stingle){ .card-link title="Source Code" }
- **Stingle** is a gallery and camera application with built-in, end-to-end encrypted backup and sync functionality for your photos and videos. Storage starts at 1GB for free accounts on their cloud, or you can host your own Stingle API server for total independence.
+
+Downloads
- [:octicons-home-16: Homepage](https://stingle.org/){ .md-button .md-button--primary }
- [:octicons-eye-16:](https://stingle.org/privacy/){ .card-link title="Privacy Policy" }
- [:octicons-info-16:](https://stingle.org/faq/){ .card-link title=Documentation}
- [:octicons-code-16:](https://github.com/stingle){ .card-link title="Source Code" }
+- [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=io.ente.photos)
+- [:simple-android: Android](https://play.google.com/store/apps/details?id=org.stingle.photos)
+- [:simple-appstore: App Store](https://apps.apple.com/in/app/stingle-photos/id1582535448)
+- [:simple-github: GitHub](https://github.com/stingle)
- ??? downloads
+
- - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=io.ente.photos)
- - [:simple-android: Android](https://play.google.com/store/apps/details?id=org.stingle.photos)
- - [:simple-appstore: App Store](https://apps.apple.com/in/app/stingle-photos/id1582535448)
- - [:simple-github: GitHub](https://github.com/stingle)
+
## PhotoPrism
-!!! recommendation
+
- ![PhotoPrism logo](assets/img/photo-management/photoprism.svg){ align=right }
+![PhotoPrism logo](assets/img/photo-management/photoprism.svg){ align=right }
- **PhotoPrism** is a self-hostable platform for managing photos. It supports album syncing and sharing as well as a variety of other [features](https://www.photoprism.app/features). It does not include E2EE, so it's best hosted on a server that you trust and is under your control.
+**PhotoPrism** is a self-hostable platform for managing photos. It supports album syncing and sharing as well as a variety of other [features](https://www.photoprism.app/features). It does not include E2EE, so it's best hosted on a server that you trust and is under your control.
- [:octicons-home-16: Homepage](https://www.photoprism.app){ .md-button .md-button--primary }
- [:octicons-eye-16:](https://www.photoprism.app/privacy){ .card-link title="Privacy Policy" }
- [:octicons-info-16:](https://www.photoprism.app/kb){ .card-link title=Documentation}
- [:octicons-code-16:](https://github.com/photoprism){ .card-link title="Source Code" }
+[:octicons-home-16: Homepage](https://www.photoprism.app){ .md-button .md-button--primary }
+[:octicons-eye-16:](https://www.photoprism.app/privacy){ .card-link title="Privacy Policy" }
+[:octicons-info-16:](https://www.photoprism.app/kb){ .card-link title=Documentation}
+[:octicons-code-16:](https://github.com/photoprism){ .card-link title="Source Code" }
- ??? downloads
+
+Downloads
- - [:simple-github: GitHub](https://github.com/photoprism)
+- [:simple-github: GitHub](https://github.com/photoprism)
+
+
+
+
## Criteria
**Please note we are not affiliated with any of the projects we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements to allow us to provide objective recommendations. We suggest you familiarize yourself with this list before choosing to use a project, and conduct your own research to ensure it's the right choice for you.
-!!! example "This section is new"
+
+
This section is new
+
+We are working on establishing defined criteria for every section of our site, and this may be subject to change. If you have any questions about our criteria, please [ask on our forum](https://discuss.privacyguides.net/latest) and don't assume we didn't consider something when making our recommendations if it is not listed here. There are many factors considered and discussed when we recommend a project, and documenting every single one is a work-in-progress.
- We are working on establishing defined criteria for every section of our site, and this may be subject to change. If you have any questions about our criteria, please [ask on our forum](https://discuss.privacyguides.net/latest) and don't assume we didn't consider something when making our recommendations if it is not listed here. There are many factors considered and discussed when we recommend a project, and documenting every single one is a work-in-progress.
+
### Minimum Requirements