diff --git a/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.html b/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.html
new file mode 100644
index 000000000..5653d7447
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.html
@@ -0,0 +1,4 @@
+<#IsSubject>Der Termin am <#AptStartDate /> um <#AptStartTime /> wurde gelöscht.#IsSubject>
+<#IsBody>
+Der Termin am <#AptStartDate /> um <#AptStartTime /> wurde von <#Organizer /> gelöscht.
+#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.wod b/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.wod
new file mode 100644
index 000000000..3e37496c4
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.wod
@@ -0,0 +1,34 @@
+AptStartDate: WOString {
+ value = newStartDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+AptStartTime: WOString {
+ value = newStartDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+Organizer: WOString {
+ value = newApt.organizer.cnWithoutQuotes;
+ escapeHTML = NO;
+}
+
+HasHomePageURL: WOConditional {
+ condition = homePageURL.length;
+}
+
+HomePageURL: WOString {
+ value = appointmentURL;
+ escapeHTML = NO;
+}
+
+IsSubject: WOConditional {
+ condition = isSubject;
+}
+
+IsBody: WOConditional {
+ condition = isSubject;
+ negate = YES;
+}
diff --git a/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.html b/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.html
new file mode 100644
index 000000000..982c66a1a
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.html
@@ -0,0 +1,7 @@
+<#IsSubject>Termin am <#AptStartDate /> um <#AptStartTime />#IsSubject>
+<#IsBody>
+<#Organizer /> lädt Sie zu einem Termin am <#AptStartDate /> um <#AptStartTime /> ein.
+<#HasHomePageURL>
+Bitte benutzen Sie folgende URL, um anzugeben, ob Sie an dem Termin teilnehmen können: <#HomePageURL />.
+#HasHomePageURL>
+#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.wod b/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.wod
new file mode 100644
index 000000000..3e37496c4
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.wod
@@ -0,0 +1,34 @@
+AptStartDate: WOString {
+ value = newStartDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+AptStartTime: WOString {
+ value = newStartDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+Organizer: WOString {
+ value = newApt.organizer.cnWithoutQuotes;
+ escapeHTML = NO;
+}
+
+HasHomePageURL: WOConditional {
+ condition = homePageURL.length;
+}
+
+HomePageURL: WOString {
+ value = appointmentURL;
+ escapeHTML = NO;
+}
+
+IsSubject: WOConditional {
+ condition = isSubject;
+}
+
+IsBody: WOConditional {
+ condition = isSubject;
+ negate = YES;
+}
diff --git a/SoObjects/Appointments/SOGoAptMailGermanRemoval.wo/SOGoAptMailGermanRemoval.html b/SoObjects/Appointments/SOGoAptMailGermanRemoval.wo/SOGoAptMailGermanRemoval.html
new file mode 100644
index 000000000..3133ccc63
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailGermanRemoval.wo/SOGoAptMailGermanRemoval.html
@@ -0,0 +1,4 @@
+<#IsSubject>Von dem Termin am <#AptStartDate /> um <#AptStartTime /> gelöscht#IsSubject>
+<#IsBody>
+Sie sind nicht mehr eingeladen zu dem Termin am <#AptStartDate /> um <#AptStartTime /> organisiert von <#Organizer />.
+#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailGermanRemoval.wo/SOGoAptMailGermanRemoval.wod b/SoObjects/Appointments/SOGoAptMailGermanRemoval.wo/SOGoAptMailGermanRemoval.wod
new file mode 100644
index 000000000..3e37496c4
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailGermanRemoval.wo/SOGoAptMailGermanRemoval.wod
@@ -0,0 +1,34 @@
+AptStartDate: WOString {
+ value = newStartDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+AptStartTime: WOString {
+ value = newStartDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+Organizer: WOString {
+ value = newApt.organizer.cnWithoutQuotes;
+ escapeHTML = NO;
+}
+
+HasHomePageURL: WOConditional {
+ condition = homePageURL.length;
+}
+
+HomePageURL: WOString {
+ value = appointmentURL;
+ escapeHTML = NO;
+}
+
+IsSubject: WOConditional {
+ condition = isSubject;
+}
+
+IsBody: WOConditional {
+ condition = isSubject;
+ negate = YES;
+}
diff --git a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html
new file mode 100644
index 000000000..b0fd4dc93
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html
@@ -0,0 +1,5 @@
+<#IsSubject>Veränderung des Termins am <#OldAptStartDate /> um <#OldAptStartTime />#IsSubject>
+<#IsBody>
+Der Termin, der ursprünglich am <#OldAptStartDate /> um <#OldAptStartTime /> stattfinden sollte, ist jetzt für den <#NewAptStartDate /> um <#NewAptStartTime /> geplant.
+Bitte geben Sie an folgender URL an, ob Sie an diesem Termin zum neuen Datum teilnehmen können: <#HomePageURL />.
+#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod
new file mode 100644
index 000000000..3dccef2aa
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod
@@ -0,0 +1,46 @@
+OldAptStartDate: WOString {
+ value = oldStartDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+OldAptStartTime: WOString {
+ value = oldStartDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+NewAptStartDate: WOString {
+ value = newStartDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+NewAptStartTime: WOString {
+ value = newStartDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+Organizer: WOString {
+ value = newApt.organizer.cnWithoutQuotes;
+ escapeHTML = NO;
+}
+
+HasHomePageURL: WOConditional {
+ condition = homePageURL.length;
+}
+
+HomePageURL: WOString {
+ value = appointmentURL;
+ escapeHTML = NO;
+}
+
+IsSubject: WOConditional {
+ condition = isSubject;
+}
+
+IsBody: WOConditional {
+ condition = isSubject;
+ negate = YES;
+}
diff --git a/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html b/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html
new file mode 100644
index 000000000..eb2429712
--- /dev/null
+++ b/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html
@@ -0,0 +1,8 @@
+-------- Message original --------
+Betreff: <#subject/>
+Datum: <#date/>
+Sender: <#from/>
+<#hasReplyTo>Antworten an: <#replyTo/>#hasReplyTo><#hasOrganization>Organisation: <#organization/>#hasOrganization>An: <#to/>
+<#hasCc>Kopie: <#cc/>#hasCc><#hasNewsGroups>Newsgroup: <#newsgroups/>#hasNewsGroups><#hasReferences>Referenzen: <#references/>#hasReferences>
+
+<#messageBody/>
diff --git a/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.wod b/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.wod
new file mode 100644
index 000000000..517bc8cc1
--- /dev/null
+++ b/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.wod
@@ -0,0 +1,69 @@
+subject: WOString {
+ value = subject;
+ escapeHTML = NO;
+}
+
+date: WOString {
+ value = date;
+ escapeHTML = NO;
+}
+
+from: WOString {
+ value = from;
+ escapeHTML = NO;
+}
+
+hasReplyTo: WOConditional {
+ condition = hasReplyTo;
+}
+
+replyTo: WOString {
+ value = replyTo;
+ escapeHTML = NO;
+}
+
+hasOrganization: WOConditional {
+ condition = hasOrganization;
+}
+
+organization: WOString {
+ value = organization;
+ escapeHTML = NO;
+}
+
+to: WOString {
+ value = to;
+ escapeHTML = NO;
+}
+
+hasCc: WOConditional {
+ condition = hasCc;
+}
+
+cc: WOString {
+ value = cc;
+ escapeHTML = NO;
+}
+
+hasNewsGroups: WOConditional {
+ condition = hasNewsGroups;
+}
+
+newsgroups: WOString {
+ value = newsgroups;
+ escapeHTML = NO;
+}
+
+hasReferences: WOConditional {
+ condition = hasReferences;
+}
+
+references: WOString {
+ value = references;
+ escapeHTML = NO;
+}
+
+messageBody: WOString {
+ value = messageBody;
+ escapeHTML = NO;
+}
diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings
index 85b7a2452..dbc7941c3 100644
--- a/UI/PreferencesUI/German.lproj/Localizable.strings
+++ b/UI/PreferencesUI/German.lproj/Localizable.strings
@@ -6,7 +6,7 @@
"Out of Office" = "Abwesenheit";
"Date and Time" = "Datum und Zeit";
"Calendar Options" = "Kalender";
-"Mail Options" = "Mail Options";
+"Mail Options" = "E-Mail";
"Password" = "Passwort";
/* ooo */
@@ -66,9 +66,9 @@
"reminderTime_4800" = "2 Tage";
/* Mailer */
-"Forward messages:" = "Forward messages:";
-"messageforward_inline" = "Inline";
-"messageforward_attached" = "As Attachment";
+"Forward messages:" = "Nachrichten weiterleiten:";
+"messageforward_inline" = "Eingebunden";
+"messageforward_attached" = "Als Anhang";
/* password */
"New password:" = "Neues Passwort:";
diff --git a/UI/Templates/SOGoACLGermanAdditionAdvisory.wox b/UI/Templates/SOGoACLGermanAdditionAdvisory.wox
new file mode 100644
index 000000000..313f9a448
--- /dev/null
+++ b/UI/Templates/SOGoACLGermanAdditionAdvisory.wox
@@ -0,0 +1,22 @@
+
+
+
+
+
+ Zugangserlaubniss von erstellt
+
+
+
+ hat Ihnen den Zugang zu seinem Ordner '' erlaubt.
+Folgende URL erlaubt Ihnen, sich sofort an diesem Ordner zu abonnieren:
+ unsubscribe?mail-invitation=YES
+
+Sie können sich auch später immer noch durch die SOGo Webseiten abonnieren.
+
+
+
diff --git a/UI/Templates/SOGoACLGermanRemovalAdvisory.wox b/UI/Templates/SOGoACLGermanRemovalAdvisory.wox
new file mode 100644
index 000000000..9638f657c
--- /dev/null
+++ b/UI/Templates/SOGoACLGermanRemovalAdvisory.wox
@@ -0,0 +1,21 @@
+
+
+
+
+
+ Zugangserlaubniss von gelöscht
+
+
+
+ erlaubt Ihnen nicht mehr den Zugang zu seinem Order ''.
+Sie können sich sofort an folgender URL von diesem Order des-abonnieren:
+ unsubscribe?mail-invitation=YES
+
+Sich können sich auch später immer noch durch die SOGo Webseiten des-abonnieren.
+
+