diff --git a/content/messaging/_index.en.md b/content/messaging/_index.en.md
index db468621eb58550a87a4c3ac522b125e61f01925..e2decb648a0f2b196d6db46324a0b76ffbd83dbe 100644
--- a/content/messaging/_index.en.md
+++ b/content/messaging/_index.en.md
@@ -1,5 +1,5 @@
 ---
-title: "Write messages"
+title: "Messages"
 date: 2020-07-15T18:10:07+02:00
 draft: false
 chapter: true
diff --git a/content/messaging/_index.md b/content/messaging/_index.md
index 1d9b5bab1567433886a586af9a772e40ade50258..6061eb91b18dee759321313d2d8f72809717356e 100644
--- a/content/messaging/_index.md
+++ b/content/messaging/_index.md
@@ -1,5 +1,5 @@
 ---
-title: "Nachrichten schreiben"
+title: "Nachrichten"
 date: 2020-07-15T18:10:07+02:00
 draft: false
 chapter: true
diff --git a/content/messaging/search.en.md b/content/messaging/search.en.md
new file mode 100644
index 0000000000000000000000000000000000000000..a177cc23de563929b8225c434bb96bc45997a96d
--- /dev/null
+++ b/content/messaging/search.en.md
@@ -0,0 +1,25 @@
+---
+title: "Message search"
+date: 2021-03-02T11:42:35+01:00
+draft: false
+chapter: true
+weight: 40
+---
+
+## Message search
+
+It is not uncommon to want to search for older conversation content.  To search the
+message history in a room (or in all rooms) for a certain text, you will find the text,
+you can find the "Search" button in the upper right corner of the Element app.  "Search"
+button.
+
+![Display of the position of the function button for the search](/images/message-search_en.png)
+
+Searching for messages is possible in unencrypted rooms without any problem, since Element
+has access to all messages. The situation is different in encrypted rooms.  This function
+is only possible using the desktop client (see [Clients / Installation]({{< relref
+"clients" >}})), because the messages must be cached for the search. The message search
+must be explicitly enabled under `Settings` -> `Security & Privacy` -> `Message search`.
+Afterwards, searching is also possible in encrypted rooms.
+
+![Settings section for enabling message search](/images/message-search-active_en.png)
diff --git a/content/messaging/search.md b/content/messaging/search.md
new file mode 100644
index 0000000000000000000000000000000000000000..2b83c3e8158bb73fffc27121d90f7981242f93bf
--- /dev/null
+++ b/content/messaging/search.md
@@ -0,0 +1,27 @@
+---
+title: "Nachrichten suchen"
+date: 2021-03-02T11:42:35+01:00
+draft: false
+chapter: true
+weight: 40
+---
+
+## Nachrichten suchen
+
+Nicht selten kommt es vor, dass nach älteren Gesprächsinhalten gesucht werden möchte. 
+Um den Nachrichtenverlauf in einem Raum (oder in allen Räumen) nach einen bestimmten Text
+zu durchsuchen, befindet sich in der oberen rechte Ecke der Element-App der
+"Suchen"-Button.
+
+![Darstellung der Position des Funktionsbutton für die Suche](/images/message-search_de.png)
+
+Das Suchen nach Nachrichten ist in unverschlüsselten Räumen ohne Problem möglich, da
+Element auf alle Nachrichten Zugriff hat. Anders sieht es in verschlüsselten Räumen aus.
+Diese Funktion ist nur unter Verwendung des Desktop-Clients möglich (siehe [Clients /
+Installation]({{< relref "clients" >}})), da die Nachrichten für die Suche
+zwischengespeichert werden müssen. Die Nachrichtensuche muss explizit unter
+`Einstellungen` -> `Sicherheit & Datenschutz` -> `Nachrichtensuche` aktiviert werden.
+Anschließend ist das Suchen auch in verschlüsselten Räumen möglich.
+
+![Einstellungsebereich für das Aktivieren der Nachrichtensuche](/images/message-search-active_de.png)
+
diff --git a/static/images/message-search-active_de.png b/static/images/message-search-active_de.png
new file mode 100644
index 0000000000000000000000000000000000000000..9feddb80211864fd1617e43da11e3320b9453329
Binary files /dev/null and b/static/images/message-search-active_de.png differ
diff --git a/static/images/message-search-active_en.png b/static/images/message-search-active_en.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cc5d68c7a9a87ccabc95038ede619ef2056f624
Binary files /dev/null and b/static/images/message-search-active_en.png differ
diff --git a/static/images/message-search_de.png b/static/images/message-search_de.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b3531b43f7e0e8a590e7fd26695cb983f5e5829
Binary files /dev/null and b/static/images/message-search_de.png differ
diff --git a/static/images/message-search_en.png b/static/images/message-search_en.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0bf121572b1a869026324fb0d9cf8014292865f
Binary files /dev/null and b/static/images/message-search_en.png differ