diff --git a/src/jmc/lang.py b/src/jmc/lang.py
index 7db5a44..e2a66fb 100644
--- a/src/jmc/lang.py
+++ b/src/jmc/lang.py
@@ -34,6 +34,7 @@ class Lang(jcl.lang.Lang):
         field_host = u"Host"
         field_port = u"Port"
         field_ssl = u"Secure connection (SSL)"
+        field_tls = u"Secure connection (TLS)"
         field_store_password = u"Store password on Jabber server?"
         field_live_email_only = u"Reports only emails received while connected to Jabber"
         field_interval = u"Mail check interval (in minutes)"
@@ -82,6 +83,7 @@ class Lang(jcl.lang.Lang):
         field_host = u"Adresse du serveur email"
         field_port = u"Port du serveur email"
         field_ssl = u"Connexion sécurisé (SSL)"
+        field_tls = u"Connexion sécurisé (TLS)"
         field_store_password = u"Sauvegarder le mot de passe sur le serveur Jabber ?"
         field_live_email_only = u"Vérifier les nouveaux emails seulement " \
             "lorsqu'une session Jabber est ouverte"
diff --git a/src/jmc/model/account.py b/src/jmc/model/account.py
index ac0d7e1..250018d 100644
--- a/src/jmc/model/account.py
+++ b/src/jmc/model/account.py
@@ -544,7 +544,7 @@ class SMTPAccount(Account):
     password = StringCol(default=None)
     host = StringCol(default="localhost")
     port = IntCol(default=110)
-    ssl = BoolCol(default=False)
+    tls = BoolCol(default=False)
     store_password = BoolCol(default=True)
     waiting_password_reply = BoolCol(default=False)
     default_from = StringCol(default="nobody@localhost")
@@ -615,7 +615,7 @@ class SMTPAccount(Account):
              ("port", "text-single", None,
               account.int_post_func,
               lambda bare_from_jid: real_class.get_default_port()),
-             ("ssl", "boolean", None,
+             ("tls", "boolean", None,
               account.default_post_func,
               lambda bare_from_jid: False),
              ("default_from", "text-single", None,
diff --git a/src/jmc/tests/lang.py b/src/jmc/tests/lang.py
index 956db21..41c7473 100644
--- a/src/jmc/tests/lang.py
+++ b/src/jmc/tests/lang.py
@@ -81,6 +81,7 @@ class Language_TestCase(jcl.tests.lang.Language_TestCase):
         self.assertNotEquals(self.lang_class.field_host, None)
         self.assertNotEquals(self.lang_class.field_port, None)
         self.assertNotEquals(self.lang_class.field_ssl, None)
+        self.assertNotEquals(self.lang_class.field_tls, None)
         self.assertNotEquals(self.lang_class.field_store_password, None)
         self.assertNotEquals(self.lang_class.field_live_email_only, None)
         self.assertNotEquals(self.lang_class.field_interval, None)