--- a/i18n/eric6_de.ts	Wed Jan 25 11:17:04 2017 +0100
+++ b/i18n/eric6_de.ts	Wed Jan 25 12:48:42 2017 +0100
@@ -13374,27 +13374,27 @@
         <translation>Sende Fehlerbericht</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="357"/>
+        <location filename="../UI/EmailDialog.py" line="364"/>
         <source>Attach file</source>
         <translation>Datei anhängen</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="339"/>
+        <location filename="../UI/EmailDialog.py" line="346"/>
         <source>&lt;p&gt;Message could not be sent.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Nachricht konnte nicht gesendet werden.&lt;br&gt;Grund: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="293"/>
+        <location filename="../UI/EmailDialog.py" line="300"/>
         <source>Mail Server Password</source>
         <translation>Mail Server Kennwort</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="293"/>
+        <location filename="../UI/EmailDialog.py" line="300"/>
         <source>Enter your mail server password</source>
         <translation>Geben Sie Ihr Mailserver-Kennwort ein</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="311"/>
+        <location filename="../UI/EmailDialog.py" line="318"/>
         <source>&lt;p&gt;Authentication failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Autorisierung fehlgeschlagen.&lt;br&gt;Grund: {0}&lt;/p&gt;</translation>
     </message>
@@ -13492,17 +13492,17 @@
 <context>
     <name>EmailPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="183"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/>
         <source>Enter your password for accessing the mail server</source>
         <translation>Geben Sie das Kennwort zum Zugriff auf den Mailserver ein</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/>
         <source>Enter your mail server username</source>
         <translation>Geben Sie Ihren Mailserver-Nutzernamen ein</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="106"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/>
         <source>Signature:</source>
         <translation>Signatur:</translation>
     </message>
@@ -13512,37 +13512,37 @@
         <translation>Gib die Adresse des E-Mail-Servers ein</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="92"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/>
         <source>Email address:</source>
         <translation>E-Mail-Adresse:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/>
         <source>Enter your email signature</source>
         <translation>Gib die E-Mail-Signatur ein</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="99"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/>
         <source>Enter your email address</source>
         <translation>Gib die E-Mail-Adresse ein</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="138"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/>
         <source>Select to authenticatate against the mail server</source>
         <translation>Auswählen, wenn der Mailserver eine Autorisierung verlangt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="141"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/>
         <source>Mail server needs authentication</source>
         <translation>Mailserver verlangt Autorisierung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="153"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/>
         <source>Username:</source>
         <translation>Nutzername:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/>
         <source>Password:</source>
         <translation>Kennwort:</translation>
     </message>
@@ -13552,17 +13552,12 @@
         <translation>&lt;b&gt;E-Mail-Einstellungen&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="128"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/>
         <source>Select to use TLS</source>
         <translation>Auswählen, um TLS zu verwenden</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="131"/>
-        <source>Use TLS</source>
-        <translation>Verwende TLS</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="60"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/>
         <source>Enter the port of the mail server</source>
         <translation>Gibt den Port des E-Mail-Servers ein</translation>
     </message>
@@ -13572,35 +13567,65 @@
         <translation>Ausgangsmailserver (SMTP):</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/>
-        <source>Outgoing mail server port:</source>
-        <translation>Ausgangsmailserver Port:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="193"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/>
         <source>Press to test the login data</source>
         <translation>Drücken, um die Anmeldedaten zu testen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="196"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/>
         <source>Test Login</source>
         <translation>Anmeldung testen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
         <source>Login Test</source>
         <translation>Anmeldetest</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="138"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/>
         <source>The login test succeeded.</source>
         <translation>Der Anmeldetest war erfolgreich.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
         <source>&lt;p&gt;The login test failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Der Anmeldetest ist fehlgeschlagen.&lt;br&gt;Ursache: {0}&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/>
+        <source>Encryption Method:</source>
+        <translation>Verschlüsselungsmethode:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/>
+        <source>Select to use no encryption</source>
+        <translation>Auswählen, um keine Verschlüsselung zu verwenden</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/>
+        <source>None</source>
+        <translation>keine</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/>
+        <source>Select to use SSL</source>
+        <translation>Auswählen, um SSL zu verwenden</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/>
+        <source>SSL</source>
+        <translation>SSL</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/>
+        <source>TLS</source>
+        <translation>TLS</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/>
+        <source>Port:</source>
+        <translation>Port:</translation>
+    </message>
 </context>
 <context>
     <name>EricAccessHandler</name>