diff --git a/documents/enigmail/em_einstellungen_allgemein.png b/documents/enigmail/bilder/einstellungen/em_einstellungen_allgemein.png
similarity index 100%
rename from documents/enigmail/em_einstellungen_allgemein.png
rename to documents/enigmail/bilder/einstellungen/em_einstellungen_allgemein.png
diff --git a/documents/enigmail/em_einstellungen_allgemein_winpfad.png b/documents/enigmail/bilder/einstellungen/em_einstellungen_allgemein_winpfad.png
similarity index 100%
rename from documents/enigmail/em_einstellungen_allgemein_winpfad.png
rename to documents/enigmail/bilder/einstellungen/em_einstellungen_allgemein_winpfad.png
diff --git a/documents/enigmail/em_einstellungen_erweitert.png b/documents/enigmail/bilder/einstellungen/em_einstellungen_erweitert.png
similarity index 100%
rename from documents/enigmail/em_einstellungen_erweitert.png
rename to documents/enigmail/bilder/einstellungen/em_einstellungen_erweitert.png
diff --git a/documents/enigmail/em_einstellungen_fehlersuche.png b/documents/enigmail/bilder/einstellungen/em_einstellungen_fehlersuche.png
similarity index 100%
rename from documents/enigmail/em_einstellungen_fehlersuche.png
rename to documents/enigmail/bilder/einstellungen/em_einstellungen_fehlersuche.png
diff --git a/documents/enigmail/em_einstellungen_konto_openpgp01.png b/documents/enigmail/bilder/einstellungen/em_einstellungen_konto_openpgp01.png
similarity index 100%
rename from documents/enigmail/em_einstellungen_konto_openpgp01.png
rename to documents/enigmail/bilder/einstellungen/em_einstellungen_konto_openpgp01.png
diff --git a/documents/enigmail/em_einstellungen_konto_openpgp01_3schritt.png b/documents/enigmail/bilder/einstellungen/em_einstellungen_konto_openpgp01_3schritt.png
similarity index 100%
rename from documents/enigmail/em_einstellungen_konto_openpgp01_3schritt.png
rename to documents/enigmail/bilder/einstellungen/em_einstellungen_konto_openpgp01_3schritt.png
diff --git a/documents/enigmail/em_einstellungen_mime.png b/documents/enigmail/bilder/einstellungen/em_einstellungen_mime.png
similarity index 100%
rename from documents/enigmail/em_einstellungen_mime.png
rename to documents/enigmail/bilder/einstellungen/em_einstellungen_mime.png
diff --git a/documents/enigmail/em_einstellungen_senden.png b/documents/enigmail/bilder/einstellungen/em_einstellungen_senden.png
similarity index 100%
rename from documents/enigmail/em_einstellungen_senden.png
rename to documents/enigmail/bilder/einstellungen/em_einstellungen_senden.png
diff --git a/documents/enigmail/em_schluesselverwaltung01.png b/documents/enigmail/bilder/verwaltung/em_schluesselverwaltung01.png
similarity index 100%
rename from documents/enigmail/em_schluesselverwaltung01.png
rename to documents/enigmail/bilder/verwaltung/em_schluesselverwaltung01.png
diff --git a/documents/enigmail/em_schluesselverwaltung02.png b/documents/enigmail/bilder/verwaltung/em_schluesselverwaltung02.png
similarity index 100%
rename from documents/enigmail/em_schluesselverwaltung02.png
rename to documents/enigmail/bilder/verwaltung/em_schluesselverwaltung02.png
diff --git a/documents/enigmail/em_schluesselverwaltung03.png b/documents/enigmail/bilder/verwaltung/em_schluesselverwaltung03.png
similarity index 100%
rename from documents/enigmail/em_schluesselverwaltung03.png
rename to documents/enigmail/bilder/verwaltung/em_schluesselverwaltung03.png
diff --git a/documents/enigmail/enigmail_nutzung02.lyx b/documents/enigmail/enigmail_nutzung02.lyx
index 93fda8f..c144342 100644
--- a/documents/enigmail/enigmail_nutzung02.lyx
+++ b/documents/enigmail/enigmail_nutzung02.lyx
@@ -1,5 +1,7 @@
-#LyX 1.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 221
+#LyX 1.4.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 245
+\begin_document
+\begin_header
 \textclass article
 \begin_preamble
 \usepackage{hyperref}
@@ -11,308 +13,537 @@
 \fontscheme default
 \graphics default
 \paperfontsize default
-\spacing single 
-\papersize Default
-\paperpackage a4
-\use_geometry 0
-\use_amsmath 0
-\use_natbib 0
-\use_numerical_citations 0
+\spacing single
+\papersize default
+\use_geometry false
+\use_amsmath 1
+\cite_engine basic
+\use_bibtopic false
 \paperorientation portrait
 \secnumdepth 3
 \tocdepth 3
 \paragraph_separation skip
 \defskip medskip
 \quotes_language english
-\quotes_times 2
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
+\tracking_changes false
+\output_changes true
+\end_header
 
-\layout Standard
-
+\begin_body
 
+\begin_layout Standard
 \begin_inset ERT
-status Collapsed
+status collapsed
 
-\layout Standard
+\begin_layout Standard
 
-\backslash 
+
+\backslash
 begin{rawhtml}
-\layout Standard
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
 <div id="container">
-\layout Standard
+\end_layout
 
-\backslash 
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
 end{rawhtml}
-\end_inset 
+\end_layout
+
+\end_inset
 
 
-\layout Standard
-
+\end_layout
 
+\begin_layout Standard
 \begin_inset Include \input{menue.inc}
 preview false
 
-\end_inset 
+\end_inset
 
 
-\layout Standard
-
+\end_layout
 
+\begin_layout Standard
 \begin_inset ERT
-status Collapsed
+status collapsed
 
-\layout Standard
+\begin_layout Standard
 
-\backslash 
+
+\backslash
 begin{rawhtml}
-\layout Standard
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
 <!-- main starts here -->
-\layout Standard
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
 <div id="main">
-\layout Standard
+\end_layout
 
-\backslash 
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
 end{rawhtml}
-\end_inset 
+\end_layout
+
+\end_inset
 
 
-\layout Title
+\end_layout
 
+\begin_layout Title
 Enigmail - die Schlüsselverwaltung II
-\layout Standard
-
+\end_layout
 
+\begin_layout Standard
 \begin_inset LatexCommand \tableofcontents{}
 
-\end_inset 
+\end_inset
 
 
-\layout Subsection
+\end_layout
 
+\begin_layout Subsection
 Einen öffentlichen Schlüssel importieren
-\layout Standard
+\end_layout
 
+\begin_layout Standard
 Du hast eine Datei von deinem Mailpartner bekommen, die seinen öffentlichen
  Schlüssel enthält.
  Das kann auf verschiedenen Wegen geschehen: per E-Mail, auf Diskette oder
  per USB-Stick - wie auch immer.
  Speichere diese Datei in einem Verzeichnis auf deiner Festplatte.
  Um einen Schlüssel zu importieren, starte die Schlüsselverwaltung:
-\layout Standard
-
+\end_layout
 
+\begin_layout Standard
 \begin_inset Float figure
 wide false
-collapsed false
-
-\layout Standard
-\align center 
+sideways false
+status open
 
+\begin_layout Standard
+\align center
 \begin_inset Graphics
-	filename em_schluesselverwaltung01.png
+	filename bilder/verwaltung/em_schluesselverwaltung01.png
 
-\end_inset 
+\end_inset
 
 
-\layout Caption
+\end_layout
 
+\begin_layout Caption
 Starte die Schlüsselverwaltung
-\end_inset 
+\end_layout
+
+\end_inset
 
 
-\layout Standard
+\end_layout
 
+\begin_layout Standard
 Nun kannst du in der Menüleiste 
 \begin_inset ERT
-status Collapsed
+status collapsed
 
-\layout Standard
+\begin_layout Standard
 
-\backslash 
+
+\backslash
 begin{rawhtml}
-\layout Standard
-<span class="textit">
-\layout Standard
+\end_layout
 
-\backslash 
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+<span class="textit">
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
 end{rawhtml}
-\end_inset 
+\end_layout
+
+\end_inset
 
 Datei -> Importieren ...
 \begin_inset ERT
-status Collapsed
+status collapsed
 
-\layout Standard
+\begin_layout Standard
 
-\backslash 
+
+\backslash
 begin{rawhtml}
-\layout Standard
-</span>
-\layout Standard
+\end_layout
 
-\backslash 
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+</span>
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
 end{rawhtml}
-\end_inset 
+\end_layout
+
+\end_inset
 
  Es öffnet sich ein neues Fenster mit der Verzeichnis-Ansicht deiner Festplatte.
  Klicke dich bis zu dem Verzeichnis durch, in dem der zu importierende Schlüssel
  liegt, markiere diesen und klicke auf 
 \begin_inset ERT
-status Collapsed
+status collapsed
 
-\layout Standard
+\begin_layout Standard
 
-\backslash 
+
+\backslash
 begin{rawhtml}
-\layout Standard
-<span class="textit">
-\layout Standard
+\end_layout
 
-\backslash 
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+<span class="textit">
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
 end{rawhtml}
-\end_inset 
+\end_layout
+
+\end_inset
 
 Öffnen
 \begin_inset ERT
-status Collapsed
+status collapsed
 
-\layout Standard
+\begin_layout Standard
 
-\backslash 
+
+\backslash
 begin{rawhtml}
-\layout Standard
-</span>
-\layout Standard
+\end_layout
 
-\backslash 
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+</span>
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
 end{rawhtml}
-\end_inset 
+\end_layout
+
+\end_inset
 
 .
-\layout Subsection
+\end_layout
 
+\begin_layout Subsection
 Deinen öffentlichen Schlüssel weitergeben
-\layout Standard
+\end_layout
 
+\begin_layout Standard
 Damit andere Menschen dir verschlüsselte E-Mails schicken können, benötigen
  sie deinen öffentlichen Schlüssel.
  Die folgenden Schritte beschreiben, wie du diesen Schlüssel in eine Datei
  exportierst.
  Diese kannst du dann bspw.
  per Email an deine KommunikationspartnerInnen verschicken.
-\layout Enumerate
+\end_layout
 
+\begin_layout Enumerate
 Starte die Schlüsselverwaltung 
 \begin_inset ERT
-status Collapsed
+status collapsed
 
-\layout Standard
+\begin_layout Standard
 
-\backslash 
+
+\backslash
 begin{rawhtml}
-\layout Standard
-<span class="textit">
-\layout Standard
+\end_layout
 
-\backslash 
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+<span class="textit">
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
 end{rawhtml}
-\end_inset 
+\end_layout
+
+\end_inset
 
 OpenPGP -> Schlüssel verwalten ...
 \begin_inset ERT
-status Collapsed
+status collapsed
 
-\layout Standard
+\begin_layout Standard
 
-\backslash 
+
+\backslash
 begin{rawhtml}
-\layout Standard
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
 </span>
-\layout Standard
+\end_layout
 
-\backslash 
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
 end{rawhtml}
-\end_inset 
+\end_layout
+
+\end_inset
 
 
-\layout Enumerate
+\end_layout
 
+\begin_layout Enumerate
 Markiere deinen Schlüssel indem du ihn mit der Maus anklickst
-\layout Enumerate
+\end_layout
 
+\begin_layout Enumerate
 Klicke nun auf 
 \begin_inset ERT
-status Collapsed
+status collapsed
 
-\layout Standard
+\begin_layout Standard
 
-\backslash 
+
+\backslash
 begin{rawhtml}
-\layout Standard
-<span class="textit">
-\layout Standard
+\end_layout
 
-\backslash 
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+<span class="textit">
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
 end{rawhtml}
-\end_inset 
+\end_layout
+
+\end_inset
 
 Datei -> Exportieren ...
 \begin_inset ERT
-status Collapsed
+status collapsed
 
-\layout Standard
+\begin_layout Standard
 
-\backslash 
+
+\backslash
 begin{rawhtml}
-\layout Standard
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
 </span>
-\layout Standard
+\end_layout
 
-\backslash 
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
 end{rawhtml}
-\end_inset 
+\end_layout
+
+\end_inset
 
 
-\layout Enumerate
+\end_layout
 
+\begin_layout Enumerate
 Jetzt kannst du das Verzeichnis auswählen, in dem dein öffentlicher Schlüssel
  gespeichert werden soll
-\layout Enumerate
+\end_layout
 
+\begin_layout Enumerate
 Diese Datei kannst du als Anhang einer Email an deine KommunikationspartnerInnen
  versenden (oder direkt 
 \begin_inset ERT
-status Collapsed
+status collapsed
 
-\layout Standard
+\begin_layout Standard
 
-\backslash 
+
+\backslash
 begin{rawhtml}
-\layout Standard
-<span class="textit">
-\layout Standard
+\end_layout
 
-\backslash 
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+<span class="textit">
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
 end{rawhtml}
-\end_inset 
+\end_layout
+
+\end_inset
 
 Datei -> Öffentliche Schlüssel per E-Mail senden
 \begin_inset ERT
-status Open
+status open
 
-\layout Standard
+\begin_layout Standard
 
-\backslash 
+
+\backslash
 begin{rawhtml}
-\layout Standard
-</span>
-\layout Standard
+\end_layout
 
-\backslash 
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+</span>
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
 end{rawhtml}
-\end_inset 
+\end_layout
+
+\end_inset
 
 )
-\the_end
+\end_layout
+
+\end_body
+\end_document