diff --git a/jabber/component.py b/jabber/component.py
index b965bee..e199d3a 100644
--- a/jabber/component.py
+++ b/jabber/component.py
@@ -653,14 +653,18 @@ class MailComponent(Component):
 	if self.__storage.has_key((base_from_jid, name)):
 	    m = Message(from_jid = self.jid, to_jid = from_jid, \
 			stanza_type = "message", \
-			body = lang_class.update_account_message \
-			% (type, name, login, password, socket))
+                        subject = lang_class.update_account_message_subject \
+                        % (type, name), \
+			body = lang_class.update_account_message_body \
+			% (login, password, socket))
 	    self.stream.send(m)
 	else:
 	    m = Message(from_jid = self.jid, to_jid = from_jid, \
 			stanza_type = "message", \
-			body = lang_class.new_account_message \
-			% (type, name, login, password, socket))
+                        subject = lang_class.new_account_message_subject \
+			% (type, name), \
+			body = lang_class.new_account_message_body \
+			% (login, password, socket))
 	    self.stream.send(m)
 	    p = Presence(from_jid = name + "@" + unicode(self.jid), \
 			 to_jid = base_from_jid, \
diff --git a/jabber/lang.py b/jabber/lang.py
index 6bb634a..74e16d3 100644
--- a/jabber/lang.py
+++ b/jabber/lang.py
@@ -48,10 +48,12 @@ class Lang:
         update_title = u"Jabber mail connection update"
         update_instructions = u"Modifying connection '%s'"
         connection_label = u"%s connection '%s'"
-        update_account_message = u"Updated %s connection '%s': Registered with "\
-                                 "username '%s' and password '%s' on '%s'"
-        new_account_message = u"New %s connection '%s': Registered with " \
-                              "username '%s' and password '%s' on '%s'"
+        update_account_message_subject = u"Updated %s connection '%s'"
+        update_account_message_body = u"Registered with username '%s' and " \
+                                      "password '%s' on '%s'"
+        new_account_message_subject = u"New %s connection '%s' created"
+        new_account_message_body = u"Registered with " \
+                                   "username '%s' and password '%s' on '%s'"
         ask_password_subject = u"Password request"
         ask_password_body = u"Reply to this message with the password " \
                             "for the following account : \n" \
@@ -87,10 +89,10 @@ class Lang:
         update_title = u"Mise à jour du compte JMC"
         update_instructions = u"Modification de la connexion '%s'"
         connection_label = u"Connexion %s '%s'"
-        update_account_message = u"La connexion %s '%s' a été mise à jour : \n"\
-                                 "Nom d'utilisateur : '%s'\nMot de passe : '%s'\nsur : '%s'"
-        new_account_message = u"La connexion %s '%s' a été créée : \n" \
-                              "Nom d'utilisateur : '%s'\nMot de passe : '%s'\nsur : '%s'"
+        update_account_message_subject = u"La connexion %s '%s' a été mise à jour"
+        update_account_message_body = u"Nom d'utilisateur : '%s'\nMot de passe : '%s'\nsur : '%s'"
+        new_account_message_subject = u"La connexion %s '%s' a été créée"
+        new_account_message_body = u"Nom d'utilisateur : '%s'\nMot de passe : '%s'\nsur : '%s'"
         ask_password_subject = u"Demande de mot de passe"
         ask_password_body = u"Répondre à ce message avec le mot de passe du " \
                             "compte suivant : \n" \