diff --git a/www/src/index.md b/www/src/index.md
index 54697499..258567c3 100644
--- a/www/src/index.md
+++ b/www/src/index.md
@@ -1,11 +1,15 @@
-## Dear [Delta Chat](https://get.delta.chat) users and newcomers,
+## Dear [Delta Chat](https://get.delta.chat) users and newcomers ...
-Welcome to instant, interoperable and [privacy-preserving](privacy.html) messaging :)
+{% if config.mail_domain != "nine.testrun.org" %}
+Welcome to the default onboarding server ({{ config.mail_domain }})
+for Delta Chat users. For details how it avoids storing personal information
+please see our [privacy policy](privacy).
+{% endif %}
-👉 **Tap** or scan this QR code to get a random `@{{config.mail_domain}}` e-mail address
+👉 **Tap** or scan this QR code to get a `@{{config.mail_domain}}` chat profile
diff --git a/www/src/info.md b/www/src/info.md
index fccb2769..81badbd3 100644
--- a/www/src/info.md
+++ b/www/src/info.md
@@ -1,6 +1,4 @@
-
-
## More information
{{ config.mail_domain }} provides a low-maintenance, resource efficient and
@@ -11,7 +9,7 @@ for the usage in chats, especially DeltaChat.
### Choosing a chatmail address instead of using a random one
In the Delta Chat account setup
-you may tap `LOG INTO YOUR E-MAIL ACCOUNT`
+you may tap `I already have a login`
and fill the two fields like this:
- `Address`: invent a word with
diff --git a/www/src/privacy.md b/www/src/privacy.md
index e536806d..22917963 100644
--- a/www/src/privacy.md
+++ b/www/src/privacy.md
@@ -1,21 +1,32 @@
-
# Privacy Policy for {{ config.mail_domain }}
-We want to show you in a fair and transparent way
-what personal data is processed by us.
-We follow a strict privacy-by-design approach
-and try to avoid processing your data in the first place,
-but as you may know,
-the internet,
-and in particular sending e-mail messages,
-does not work without data.
-Still,
-it's only fair that you know at all times
-what personal data is processed
-when you use our service.
+{% if config.mail_domain != "nine.testrun.org" %}
+Welcome to `{{config.mail_domain}}`, the default chatmail onboarding server for Delta Chat users.
+It is operated by a small sysops team employed by [merlinux](https://merlinux.eu),
+an open-source R&D company also acting as the fiscal sponsor of Delta Chat app developments.
+See [other chatmail servers](https://delta.chat/en/chatmail) for alternative server operators.
+{% endif %}
+
+
+## Quick Privacy Summary: No personal data collected
+
+This chatmail server neither asks for nor retains personal information.
+Chatmail servers exist to reliably transmit (store and deliver) end-to-end encrypted messages
+to one or more devices.
+A Chatmail server is more similar to how the Signal messenger server relays messages
+than to classic e-mail servers who maintain permanent storage with readable personal data.
+In particular,
+
+- this chatmail server unconditionally removes any messages after {{ config.delete_mails_after }} days.
+- Log files are ephemeral and only analyzed for debugging purposes
+
+Technically, you may think of Chatmail servers as a "messaging router" at Internet-scale.
+Legally, authorities might regard this chatmail server as a "classic e-mail" server
+which collects and tracks personal data, requiring an according privacy policy.
+We do not agree on this interpretation. Yet, we provide more legal details below
+to make life easier for data protection specialists and lawyers.
-If you have any remaining questions about data protection, please contact us.
## 1. Name and contact information
@@ -178,8 +189,9 @@ for the purpose of drawing conclusions about your person.
## 4. Transfer of Data
-Your personal data
-will not be transferred to third parties
+We do not retain any personal data but e-mail messages waiting to be delivered
+may contain personal data.
+Any such residual personal data will not be transferred to third parties
for purposes other than those listed below:
a) you have given your express consent