diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang
index 8c7dcb6925..6a2c481f5a 100644
--- a/mail/lang/egw_de.lang
+++ b/mail/lang/egw_de.lang
@@ -19,6 +19,7 @@ add a new folder to %1:	mail	de	Einen neuen Ordner erstellen unter:  %1
 add all my aliases	mail	de	Alle Alias Adressen hinzufügen
 add folder	mail	de	Neuer Ordner
 add to addressbook	mail	de	zum Adressbuch hinzufügen
+add your domain as "%1" in options to list of email providers and enable api.	mail	de	Fügen Sie Ihre Domain als "%1" in Optionen zu der Liste der E-Mail-Anbieter hinzu und schalten sie API ein.
 after reply, visible during compose	mail	de	Nach dem zitierten Text, sichtbar während der Bearbeitung
 aliases+forwards	mail	de	Aliase+Weiterleitungen
 all	mail	de	alle
@@ -140,6 +141,7 @@ empty junk	mail	de	Junk-/Spam- Ordner leeren
 empty trash	mail	de	Papierkorb leeren
 enable	mail	de	Aktivieren
 enabled!	mail	de	aktiviert!
+encrypt	mail	de	Verschlüsseln
 enter the name for the new folder:	mail	de	Tragen Sie hier den Namen für den neuen Ordner ein:
 error saving %1!	mail	de	Fehler beim Speichern von %1!
 error while setting acl for folder %1!	mail	de	Fehler beim Speichern von Zugriffsrechten für den Ordner %1!
@@ -429,6 +431,7 @@ subscribe folder ...	mail	de	Ordner abonnieren ...
 subscription folders	mail	de	Ordner Abonnieren
 subscription successfully saved.	mail	de	Das Abonnieren der Ordner wurde erfolgreich gespeichert.
 successfully connected	mail	de	erfolgreich verbunden
+switch off encryption?	mail	de	Verschlüsselung ausschalten?
 template folder	mail	de	Vorlagen Ordner
 templates	mail	de	Vorlagen
 templates folder	mail	de	Ordner für Vorlage Nachrichten
@@ -502,5 +505,7 @@ yes, show all debug information available for the user	mail	de	Ja, zeige alle de
 yes, show basic info only	mail	de	Ja, nur Basis Informationen anzeigen
 you can either choose to save as infolog or tracker, not both.	mail	de	Sie können eine E-Mail entweder als Infolog ODER als Verfolgungsqueue Eintrag speichern, nicht beides gleichzeitig.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	de	Sie können $$start$$ für das obige Start- und $$end$$ für das Enddatum verwenden.
+you need to install mailvelope plugin available for chrome and firefox from %1.	mail	de	Sie müssen das Mailvelope Plugin für Chrome oder Firefox von %1 installieren.
 you need to save the message as draft first before to be able to save it into vfs	mail	de	Sie müssen die E-Mail zuerst als Entwurf speichern, bevor Sie die Mail in das VFS speichern können.
+you will loose current message body, unless you save it to your clipboard!	mail	de	Sie werden Ihren aktuellen Nachrichtentext verlieren, sofern Sie ihn nicht in der Zwischenablage speichern!
 you've got new mail	mail	de	Sie haben neue E-Mails
diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang
index 47f643d2c1..8025750038 100644
--- a/mail/lang/egw_en.lang
+++ b/mail/lang/egw_en.lang
@@ -19,6 +19,7 @@ add a new folder to %1:	mail	en	Add a new Folder to %1:
 add all my aliases	mail	en	Add all my aliases
 add folder	mail	en	Add Folder
 add to addressbook	mail	en	add to addressbook
+add your domain as "%1" in options to list of email providers and enable api.	mail	en	Add your domain as "%1" in options to list of email providers and enable API.
 after reply, visible during compose	mail	en	After reply, visible during compose
 aliases+forwards	mail	en	Aliases+Forwards
 all	mail	en	all
@@ -140,6 +141,7 @@ empty junk	mail	en	empty junk/spam folder
 empty trash	mail	en	empty trash
 enable	mail	en	Enable
 enabled!	mail	en	enabled!
+encrypt	mail	en	Encrypt
 enter the name for the new folder:	mail	en	Enter the name for the new Folder:
 error saving %1!	mail	en	Error saving %1!
 error while setting acl for folder %1!	mail	en	Error while setting ACL for folder %1!
@@ -429,6 +431,7 @@ subscribe folder ...	mail	en	Subscribe folder ...
 subscription folders	mail	en	Subscription folders
 subscription successfully saved.	mail	en	Subscription successfully saved.
 successfully connected	mail	en	Successfully connected
+switch off encryption?	mail	en	Switch off encryption?
 template folder	mail	en	template folder
 templates	mail	en	Templates
 templates folder	mail	en	Templates folder
@@ -502,5 +505,7 @@ yes, show all debug information available for the user	mail	en	yes, show all deb
 yes, show basic info only	mail	en	yes, show basic info only
 you can either choose to save as infolog or tracker, not both.	mail	en	You can either choose to save as infolog OR tracker, not both.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	en	You can use $$start$$ for the above start date and $$end$$ for the end date.
+you need to install mailvelope plugin available for chrome and firefox from %1.	mail	en	You need to install Mailvelope plugin available for Chrome and Firefox from %1.
 you need to save the message as draft first before to be able to save it into vfs	mail	en	You need to save the message as draft first before to be able to save it into VFS
+you will loose current message body, unless you save it to your clipboard!	mail	en	You will loose current message body, unless you save it to your clipboard!
 you've got new mail	mail	en	You've got new mail
diff --git a/phpgwapi/js/jsapi/app_base.js b/phpgwapi/js/jsapi/app_base.js
index fa6391b7a4..67943d6e83 100644
--- a/phpgwapi/js/jsapi/app_base.js
+++ b/phpgwapi/js/jsapi/app_base.js
@@ -1034,7 +1034,7 @@ var AppJS = Class.extend(
 							{
 								if (no_key.length)
 								{
-									reject(new Error(self.egw.lang('No key for recipient: '+no_key.join(', '))));
+									reject(new Error(self.egw.lang('No key for recipient:')+' '+no_key.join(', ')));
 								}
 								else
 								{
diff --git a/phpgwapi/lang/egw_de.lang b/phpgwapi/lang/egw_de.lang
index 815e84d20a..6e381844c2 100644
--- a/phpgwapi/lang/egw_de.lang
+++ b/phpgwapi/lang/egw_de.lang
@@ -429,6 +429,7 @@ ireland	common	de	IRLAND
 israel	common	de	ISRAEL
 it has been more then %1 days since you changed your password	common	de	Sie haben Ihr Passwort seit mehr als %1 Tagen nicht geändert.
 it is recommended that you run setup to upgrade your tables to the current version	common	de	Es ist notwendig, mit dem Setup-Programm die Tabellen zu aktualisieren.
+it is recommended to store your public key in addressbook, so other users can write you encrypted mails.	common	de	Es wird empfohlen Ihren öffentlichen Schlüssel im Adressbuch zu speichern, damit andere Benutzer Ihnen verschlüsselte EMails schreiben können.
 italic	common	de	Kursiv
 italy	common	de	ITALIEN
 jamaica	common	de	JAMAICA
@@ -562,6 +563,7 @@ no - cancel	common	de	Nicht Löschen - Abbruch
 no entries found, try again ...	common	de	Keine Einträge gefunden, nochmal versuchen ...
 no filters	common	de	Filter aufheben
 no history for this record	common	de	Keine Historie für diesen Datensatz
+no key for recipient:	common	de	Keinen Schlüssel für Empfänger:
 no savant2 template directories were found in:	common	de	Kein Savant2 Vorlagen Verzeichnis gefunden in:
 no subject	common	de	Kein Betreff
 none	common	de	Keine
@@ -798,6 +800,7 @@ start time	common	de	Startzeit
 start with	common	de	beginnt mit
 starting up...	common	de	Starte...
 status	common	de	Status
+store your public key in addressbook?	common	de	Öffentlichen Schlüssel im Adressbuch speichern?
 stretched	common	de	ausgedehnt
 subject	common	de	Betreff
 submit	common	de	Absenden
@@ -920,6 +923,7 @@ yemen	common	de	JEMEN
 yes	common	de	Ja
 yes - delete	common	de	Einträge löschen
 yes - delete including sub-entries	common	de	Einträge inklusive Untereinträge
+yes and allow non-admin users to do that too (recommended)	common	de	Ja und erlaube nicht administrativen Benutzern das auch (empfohlen)
 you are required to change your password during your first login	common	de	Sie müssen Ihr Passwort bei der ersten Anmeldung ändern
 you can customize how many icons and toolbars the editor shows.	common	de	Sie können bestimmen, wie viele Icons und Toolbars der Editor anzeigt.
 you have been successfully logged out	login	de	Abmelden erfolgreich
@@ -935,6 +939,7 @@ you need to add the webserver user '%1' to the group '%2'.	common	de	Sie müssen
 you need to be an egroupware administrator to access this functionality!	common	de	Sie müssen ein EGroupware Administrator sein, um auf diese Funktion zuzugreifen!
 you need to select some entries first!	common	de	Sie müssen zuerst einige Datensätze auswählen!
 you need to set enable logging to "%1" to create/update a log.	groupdav	de	Sie müssen logging einschalten auf "%1" setzen damit ein Log angelegt/aktualisiert wird.
+you will not be able to send or receive encrypted mails before completing that step!	common	de	Sie werden KEINE verschlüsselten Mail sender oder empfangen können, bevor Sie nicht diesen Schritt beendet haben!
 you've tried to open the egroupware application: %1, but you have no permission to access this application.	common	de	Sie haben versucht auf die EGroupware Anwendung %1 zuzugreifen, auf die Sie keine Rechte haben.
 your message could <b>not</b> be sent!<br>	common	de	Ihre Nachricht konnte <b>nicht</b> gesendet werden!<br>
 your message has been sent	common	de	Ihre Nachricht wurde versendet
diff --git a/phpgwapi/lang/egw_en.lang b/phpgwapi/lang/egw_en.lang
index 327047a91d..7a7dad5994 100644
--- a/phpgwapi/lang/egw_en.lang
+++ b/phpgwapi/lang/egw_en.lang
@@ -429,6 +429,7 @@ ireland	common	en	IRELAND
 israel	common	en	ISRAEL
 it has been more then %1 days since you changed your password	common	en	It has been more than %1 days since you have changed your password.
 it is recommended that you run setup to upgrade your tables to the current version	common	en	It is recommended that you run setup to upgrade your tables to the current version.
+it is recommended to store your public key in addressbook, so other users can write you encrypted mails.	common	en	It is recommended to store your public key in Addressbook, so other users can write you encrypted mails.
 italic	common	en	Italic
 italy	common	en	ITALY
 jamaica	common	en	JAMAICA
@@ -562,6 +563,7 @@ no - cancel	common	en	No - Cancel
 no entries found, try again ...	common	en	No entries found, try again ...
 no filters	common	en	No filters
 no history for this record	common	en	No history for this record
+no key for recipient:	common	en	No key for recipient:
 no savant2 template directories were found in:	common	en	No Savant2 template directories were found in:
 no subject	common	en	No subject
 none	common	en	None
@@ -713,6 +715,7 @@ saturday	common	en	Saturday
 saudi arabia	common	en	SAUDI ARABIA
 savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants version: %2	common	en	Savant2 version differs from Savant2 wrapper. <br/>This version: %1 <br/>Savants version: %2
 save	common	en	Save
+save as	common	en	Save as
 scheduling inbox	common	en	Scheduling inbox
 scheduling outbox	common	en	Scheduling outbox
 search	common	en	Search
@@ -797,6 +800,7 @@ start time	common	en	Start time
 start with	common	en	Start with
 starting up...	common	en	Starting up...
 status	common	en	Status
+store your public key in addressbook?	common	en	Store your public key in Addressbook?
 stretched	common	en	Stretched
 subject	common	en	Subject
 submit	common	en	Submit
@@ -919,6 +923,7 @@ yemen	common	en	YEMEN
 yes	common	en	Yes
 yes - delete	common	en	Yes - Delete
 yes - delete including sub-entries	common	en	Yes - Delete including sub-entries
+yes and allow non-admin users to do that too (recommended)	common	en	Yes and allow non-admin users to do that too (recommended)
 you are required to change your password during your first login	common	en	You are required to change your password during your first log in
 you can customize how many icons and toolbars the editor shows.	common	en	How many icons and tool bars the editor shows.
 you have been successfully logged out	login	en	You have been successfully logged out.
@@ -934,6 +939,7 @@ you need to add the webserver user '%1' to the group '%2'.	common	en	You need to
 you need to be an egroupware administrator to access this functionality!	common	en	You need to be an EGroupware administrator to access this functionality!
 you need to select some entries first!	common	en	You need to select some entries first!
 you need to set enable logging to "%1" to create/update a log.	groupdav	en	You need to set enable logging to "%1" to create/update a log.
+you will not be able to send or receive encrypted mails before completing that step!	common	en	You will NOT be able to send or receive encrypted mails before completing that step!
 you've tried to open the egroupware application: %1, but you have no permission to access this application.	common	en	You have no permission to access application  %1 !
 your message could <b>not</b> be sent!<br>	common	en	Your message could <b>not</b> be sent!<br>
 your message has been sent	common	en	Your message has been sent.
@@ -949,4 +955,3 @@ your settings have been updated	common	en	Your settings have been updated.
 zambia	common	en	ZAMBIA
 zimbabwe	common	en	ZIMBABWE
 zoom	common	en	Zoom
-save as	common	en	Save as