diff --git a/documents/windows/enigmail_installation/bilder/enigmail_installation03.png b/documents/common/enigmail_installation/bilder/enigmail_installation03.png
similarity index 100%
rename from documents/windows/enigmail_installation/bilder/enigmail_installation03.png
rename to documents/common/enigmail_installation/bilder/enigmail_installation03.png
diff --git a/documents/macos/enigmail_installation/bilder/installation/em_installation01.png b/documents/common/enigmail_installation/bilder/installation/em_installation01.png
similarity index 100%
rename from documents/macos/enigmail_installation/bilder/installation/em_installation01.png
rename to documents/common/enigmail_installation/bilder/installation/em_installation01.png
diff --git a/documents/macos/enigmail_installation/bilder/installation/em_installation02.png b/documents/common/enigmail_installation/bilder/installation/em_installation02.png
similarity index 100%
rename from documents/macos/enigmail_installation/bilder/installation/em_installation02.png
rename to documents/common/enigmail_installation/bilder/installation/em_installation02.png
diff --git a/documents/macos/enigmail_installation/bilder/installation/em_installation03.png b/documents/common/enigmail_installation/bilder/installation/em_installation03.png
similarity index 100%
rename from documents/macos/enigmail_installation/bilder/installation/em_installation03.png
rename to documents/common/enigmail_installation/bilder/installation/em_installation03.png
diff --git a/documents/macos/enigmail_installation/bilder/installation/em_installation04.png b/documents/common/enigmail_installation/bilder/installation/em_installation04.png
similarity index 100%
rename from documents/macos/enigmail_installation/bilder/installation/em_installation04.png
rename to documents/common/enigmail_installation/bilder/installation/em_installation04.png
diff --git a/documents/macos/enigmail_installation/bilder/installation/em_installation05.png b/documents/common/enigmail_installation/bilder/installation/em_installation05.png
similarity index 100%
rename from documents/macos/enigmail_installation/bilder/installation/em_installation05.png
rename to documents/common/enigmail_installation/bilder/installation/em_installation05.png
diff --git a/documents/windows/enigmail_installation/bilder/thunderbird_menue_extras_erweiterungen.png b/documents/common/enigmail_installation/bilder/thunderbird_menue_extras_erweiterungen.png
similarity index 100%
rename from documents/windows/enigmail_installation/bilder/thunderbird_menue_extras_erweiterungen.png
rename to documents/common/enigmail_installation/bilder/thunderbird_menue_extras_erweiterungen.png
diff --git a/documents/macos/enigmail_installation/bilder/unbearbeitet/enigmail_installation03.png b/documents/common/enigmail_installation/bilder/unbearbeitet/enigmail_installation03.png
similarity index 100%
rename from documents/macos/enigmail_installation/bilder/unbearbeitet/enigmail_installation03.png
rename to documents/common/enigmail_installation/bilder/unbearbeitet/enigmail_installation03.png
diff --git a/documents/macos/enigmail_installation/bilder/unbearbeitet/enigmail_installation04.png b/documents/common/enigmail_installation/bilder/unbearbeitet/enigmail_installation04.png
similarity index 100%
rename from documents/macos/enigmail_installation/bilder/unbearbeitet/enigmail_installation04.png
rename to documents/common/enigmail_installation/bilder/unbearbeitet/enigmail_installation04.png
diff --git a/documents/macos/enigmail_installation/bilder/unbearbeitet/thunderbird_menue_extras_erweiterungen.png b/documents/common/enigmail_installation/bilder/unbearbeitet/thunderbird_menue_extras_erweiterungen.png
similarity index 100%
rename from documents/macos/enigmail_installation/bilder/unbearbeitet/thunderbird_menue_extras_erweiterungen.png
rename to documents/common/enigmail_installation/bilder/unbearbeitet/thunderbird_menue_extras_erweiterungen.png
diff --git a/documents/windows/enigmail_installation/enigmail_installation.lyx b/documents/common/enigmail_installation/enigmail_installation.lyx
similarity index 96%
rename from documents/windows/enigmail_installation/enigmail_installation.lyx
rename to documents/common/enigmail_installation/enigmail_installation.lyx
index 7f00782..7fb0251 100644
--- a/documents/windows/enigmail_installation/enigmail_installation.lyx
+++ b/documents/common/enigmail_installation/enigmail_installation.lyx
@@ -1,4 +1,4 @@
-#LyX 1.4.2 created this file. For more info see http://www.lyx.org/
+#LyX 1.4.3 created this file. For more info see http://www.lyx.org/
\lyxformat 245
\begin_document
\begin_header
@@ -39,7 +39,7 @@
status open
\begin_layout Standard
-Windows-Anleitung
+MacOS und Windows-Anleitung
\end_layout
\end_inset
@@ -131,8 +131,8 @@ status collapsed
\backslash
-htmladdnormallink{enigmail-0.94.1-tb15-win32.xpi}{../../../programme/enigmail-0.94.1-tb15-w
-in32.xpi}
+htmladdnormallink{enigmail-0.94.2-tb15-win+lin+mac.xpi}{../../../programme/enigmail-0.94.2-
+tb15-win+lin+mac.xpi}
\end_layout
\end_inset
diff --git a/documents/linux/enigmail_installation/enigmail_installation.lyx b/documents/linux/enigmail_installation/enigmail_installation.lyx
index 33d3422..fac947a 100644
--- a/documents/linux/enigmail_installation/enigmail_installation.lyx
+++ b/documents/linux/enigmail_installation/enigmail_installation.lyx
@@ -1,4 +1,4 @@
-#LyX 1.4.2 created this file. For more info see http://www.lyx.org/
+#LyX 1.4.3 created this file. For more info see http://www.lyx.org/
\lyxformat 245
\begin_document
\begin_header
@@ -360,8 +360,8 @@ status collapsed
\backslash
-htmladdnormallink{enigmail-0.94.1.1-tb15-linux.xpi}{../../../programme/enigmail-0.94.1.1-tb15
--linux.xpi}
+htmladdnormallink{enigmail-0.94.2-tb15-win+lin+mac.xpi}{../../../programme/enigmail-0.94.2-
+tb15-win+lin+mac.xpi}
\end_layout
\end_inset
diff --git a/documents/macos/enigmail_installation/bilder/enigmail_installation03.png b/documents/macos/enigmail_installation/bilder/enigmail_installation03.png
deleted file mode 100644
index b455a42..0000000
Binary files a/documents/macos/enigmail_installation/bilder/enigmail_installation03.png and /dev/null differ
diff --git a/documents/macos/enigmail_installation/bilder/thunderbird_menue_extras_erweiterungen.png b/documents/macos/enigmail_installation/bilder/thunderbird_menue_extras_erweiterungen.png
deleted file mode 100644
index 01a6ddf..0000000
Binary files a/documents/macos/enigmail_installation/bilder/thunderbird_menue_extras_erweiterungen.png and /dev/null differ
diff --git a/documents/macos/enigmail_installation/enigmail_installation.lyx b/documents/macos/enigmail_installation/enigmail_installation.lyx
deleted file mode 100644
index 3d1f32f..0000000
--- a/documents/macos/enigmail_installation/enigmail_installation.lyx
+++ /dev/null
@@ -1,387 +0,0 @@
-#LyX 1.4.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 245
-\begin_document
-\begin_header
-\textclass article
-\begin_preamble
-\usepackage{hyperref}
-\usepackage{html}
-\usepackage{german}
-\end_preamble
-\language ngerman
-\inputencoding auto
-\fontscheme default
-\graphics default
-\paperfontsize default
-\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
-\papercolumns 1
-\papersides 1
-\paperpagestyle default
-\tracking_changes false
-\output_changes true
-\end_header
-
-\begin_body
-
-\begin_layout Standard
-\begin_inset Note Note
-status open
-
-\begin_layout Standard
-MacOS-Anleitung
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset Include \input{titlebar.inc}
-preview false
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset Include \input{menue.inc}
-preview false
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{rawhtml}
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\backslash
-end{rawhtml}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Title
-Enigmail installieren
-\end_layout
-
-\begin_layout Author
-E-Mails verschlüsseln
-\end_layout
-
-\begin_layout Subsection
-Installationsschritte
-\end_layout
-
-\begin_layout Standard
-Klicke mit der rechten Maustaste auf die Datei
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-htmladdnormallink{enigmail-0.94.1-darwin-x86-ppc.xpi}{../../../programme/enigmail-0.94.1-da
-rwin-x86-ppc.xpi}
-\end_layout
-
-\end_inset
-
- und speichere sie in einem Verzeichnis auf deiner Festplatte.
- Öffne anschließend Thunderbird und wähle aus dem Menü den Punkt
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{rawhtml}
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\backslash
-end{rawhtml}
-\end_layout
-
-\end_inset
-
-Extras -> Erweiterungen...
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{rawhtml}
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\backslash
-end{rawhtml}
-\end_layout
-
-\end_inset
-
-:
-\end_layout
-
-\begin_layout Standard
-\begin_inset Float figure
-wide false
-sideways false
-status open
-
-\begin_layout Standard
-\begin_inset Graphics
- filename bilder/thunderbird_menue_extras_erweiterungen.png
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Caption
-Unter
-\emph on
-Extras
-\emph default
- den Punkt
-\emph on
-Erweiterungen...
-
-\emph default
- auswählen
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-Es öffnet sich ein neues Fenster mit dem Titel
-\emph on
-Erweiterungen
-\emph default
-.
- Klicke dort auf die Schaltfläche
-\emph on
-Installieren
-\emph default
-:
-\end_layout
-
-\begin_layout Standard
-\begin_inset Float figure
-wide false
-sideways false
-status open
-
-\begin_layout Standard
-\begin_inset Graphics
- filename bilder/installation/em_installation02.png
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Caption
-Ein Klick auf
-\emph on
-Installieren
-\emph default
- bringt dich weiter
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-Nun erscheint ein Fenster mit der Verzeichnisansicht deiner Festplatte.
- Wähle die Enigmail-Installationsdatei aus dem entsprechenden Verzeichnis
- aus:
-\end_layout
-
-\begin_layout Standard
-\begin_inset Float figure
-wide false
-sideways false
-status open
-
-\begin_layout Standard
-\begin_inset Graphics
- filename bilder/enigmail_installation03.png
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Caption
-Die entsprechende Datei auswählen.
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-Bestätige anschließend die Installation:
-\end_layout
-
-\begin_layout Standard
-\begin_inset Float figure
-wide false
-sideways false
-status open
-
-\begin_layout Standard
-\begin_inset Graphics
- filename bilder/unbearbeitet/enigmail_installation04.png
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Caption
-Die Installation startet mit einem Klick auf
-\emph on
-Jetzt installieren
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-Damit die Oberfläche von Enigmail auch in Deutsch erscheint, muss die Sprachdate
-i
-\emph on
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-htmladdnormallink{enigmail-de-0.9x.xpi}{../../../programme/enigmail-de-0.9x.xpi}
-\end_layout
-
-\end_inset
-
-
-\emph default
-ebenfalls installiert werden.
- Die Installation läuft genau wie oben beschrieben ab.
-\end_layout
-
-\begin_layout Standard
-Abschließend muss Thunderbird beendet und neu gestartet werden.
- Das die Installation erfolgreich verlaufen ist, siehst du nun am neuen
- Punkt
-\emph on
-OpenPGP
-\emph default
- im Thunderbird-Menü.
-\end_layout
-
-\begin_layout Standard
-\begin_inset Include \input{progress/progress_email_programme.inc}
-preview false
-
-\end_inset
-
-
-\end_layout
-
-\end_body
-\end_document
diff --git a/documents/windows/enigmail_installation/bilder/installation/em_installation01.png b/documents/windows/enigmail_installation/bilder/installation/em_installation01.png
deleted file mode 100644
index 1a4215b..0000000
Binary files a/documents/windows/enigmail_installation/bilder/installation/em_installation01.png and /dev/null differ
diff --git a/documents/windows/enigmail_installation/bilder/installation/em_installation02.png b/documents/windows/enigmail_installation/bilder/installation/em_installation02.png
deleted file mode 100644
index 7767374..0000000
Binary files a/documents/windows/enigmail_installation/bilder/installation/em_installation02.png and /dev/null differ
diff --git a/documents/windows/enigmail_installation/bilder/installation/em_installation03.png b/documents/windows/enigmail_installation/bilder/installation/em_installation03.png
deleted file mode 100644
index 01a154f..0000000
Binary files a/documents/windows/enigmail_installation/bilder/installation/em_installation03.png and /dev/null differ
diff --git a/documents/windows/enigmail_installation/bilder/installation/em_installation04.png b/documents/windows/enigmail_installation/bilder/installation/em_installation04.png
deleted file mode 100644
index 323a71d..0000000
Binary files a/documents/windows/enigmail_installation/bilder/installation/em_installation04.png and /dev/null differ
diff --git a/documents/windows/enigmail_installation/bilder/installation/em_installation05.png b/documents/windows/enigmail_installation/bilder/installation/em_installation05.png
deleted file mode 100644
index c96e77b..0000000
Binary files a/documents/windows/enigmail_installation/bilder/installation/em_installation05.png and /dev/null differ
diff --git a/documents/windows/enigmail_installation/bilder/unbearbeitet/enigmail_installation03.png b/documents/windows/enigmail_installation/bilder/unbearbeitet/enigmail_installation03.png
deleted file mode 100644
index ae037b0..0000000
Binary files a/documents/windows/enigmail_installation/bilder/unbearbeitet/enigmail_installation03.png and /dev/null differ
diff --git a/documents/windows/enigmail_installation/bilder/unbearbeitet/enigmail_installation04.png b/documents/windows/enigmail_installation/bilder/unbearbeitet/enigmail_installation04.png
deleted file mode 100644
index e97d708..0000000
Binary files a/documents/windows/enigmail_installation/bilder/unbearbeitet/enigmail_installation04.png and /dev/null differ
diff --git a/documents/windows/enigmail_installation/bilder/unbearbeitet/thunderbird_menue_extras_erweiterungen.png b/documents/windows/enigmail_installation/bilder/unbearbeitet/thunderbird_menue_extras_erweiterungen.png
deleted file mode 100644
index b4b3b94..0000000
Binary files a/documents/windows/enigmail_installation/bilder/unbearbeitet/thunderbird_menue_extras_erweiterungen.png and /dev/null differ
diff --git a/downloads/programme.lst b/downloads/programme.lst
index 3892a0a..8e8a763 100644
--- a/downloads/programme.lst
+++ b/downloads/programme.lst
@@ -1,8 +1,6 @@
Thunderbird Setup 1.5.0.9.exe http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5.0.9/win32/de/Thunderbird%20Setup%201.5.0.9.exe http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5.0.9/win32/de/Thunderbird%20Setup%201.5.0.9.exe.asc
Thunderbird 1.5.0.9.dmg http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5.0.9/mac/de/Thunderbird%201.5.0.9.dmg http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5.0.9/mac/de/Thunderbird%201.5.0.9.dmg.asc
-enigmail-0.94.1-tb15-win32.xpi http://www.mozilla-enigmail.org/downloads/enigmail-0.94.1-tb15-win32.xpi http://www.mozilla-enigmail.org/downloads/enigmail-0.94.1-tb15-win32.xpi.asc
-enigmail-0.94.1.1-tb15-linux.xpi http://www.mozilla-enigmail.org/downloads/enigmail-0.94.1.1-tb15-linux.xpi http://www.mozilla-enigmail.org/downloads/enigmail-0.94.1.1-tb15-linux.xpi.asc
-enigmail-0.94.1-darwin-x86-ppc.xpi http://www.mozilla-enigmail.org/downloads/enigmail-0.94.1-darwin-x86-ppc.xpi http://www.mozilla-enigmail.org/downloads/enigmail-0.94.1-darwin-x86-ppc.xpi.asc
+enigmail-0.94.2-tb15-win+lin+mac.xpi http://www.mozilla-enigmail.org/downloads/enigmail-0.94.2-tb15-win+lin+mac.xpi http://www.mozilla-enigmail.org/downloads/enigmail-0.94.2-tb15-win+lin+mac.xpi.asc
enigmail-de-0.9x.xpi http://mozilla-enigmail.org/downloads/lang/0.9x/enigmail-de-0.9x.xpi
gnupg-w32cli-1.4.6.exe ftp://ftp.gnupg.org/gcrypt/binary/gnupg-w32cli-1.4.6.exe ftp://ftp.gnupg.org/gcrypt/binary/gnupg-w32cli-1.4.6.exe.sig
GnuPG1.4.1.dmg http://mesh.dl.sourceforge.net/sourceforge/macgpg/GnuPG1.4.1.dmg http://mesh.dl.sourceforge.net/sourceforge/macgpg/GnuPG1.4.1.dmg.sig