diff --git a/sflphone-gtk/src/accountwindow.c b/sflphone-gtk/src/accountwindow.c
index b4a573fb8799f9ab3e69335d4840966f1aca06f8..0ea3e8daf3fd0908975c98eba1d9d9d7846413c8 100644
--- a/sflphone-gtk/src/accountwindow.c
+++ b/sflphone-gtk/src/accountwindow.c
@@ -150,10 +150,10 @@ show_account_window (account_t * a)
   dialog = GTK_DIALOG(gtk_dialog_new_with_buttons (_("Account settings"),
 	GTK_WINDOW(get_main_window()),
 	GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-	GTK_STOCK_CANCEL,
-	GTK_RESPONSE_CANCEL,
 	GTK_STOCK_SAVE,
 	GTK_RESPONSE_ACCEPT,
+	GTK_STOCK_CANCEL,
+	GTK_RESPONSE_CANCEL,
 	NULL));
 
   gtk_dialog_set_has_separator(dialog, TRUE);
diff --git a/sflphone-gtk/src/actions.c b/sflphone-gtk/src/actions.c
index e5b7eecf289e76d9d5a1b7c01f0b2d4ec6fd165b..5a68c9ca255d88a13f77f50e2f346ccfda643ad7 100644
--- a/sflphone-gtk/src/actions.c
+++ b/sflphone-gtk/src/actions.c
@@ -41,7 +41,10 @@ sflphone_notify_voice_mail (guint count)
 	if(count > 0)
 	{
 		gchar * message = g_new0(gchar, 50);
-		g_sprintf(message, _("%d new voice mail%s"), count, (count > 1? "s" : "")); 
+		if( count > 1)
+		  g_sprintf(message, _("%d new voice mails"), count);
+		else
+		  g_sprintf(message, _("%d new voice mail"), count);	  
 		status_bar_message(message);
 		g_free(message);
 	}
diff --git a/sflphone-gtk/src/po/fr.po b/sflphone-gtk/src/po/fr.po
index 1b2d22cef30cfb59afc6355fe4179a378e3a7416..f09a05948d40ea02a6a8a06b1e309c4364c15f37 100644
--- a/sflphone-gtk/src/po/fr.po
+++ b/sflphone-gtk/src/po/fr.po
@@ -79,8 +79,8 @@ msgstr "A_ffichage"
 
 # configwindow.c
 # account settings
-msgid "Accounts previously setup."
-msgstr "Liste des comptes existants."
+msgid "Accounts previously setup"
+msgstr "Liste des comptes existants"
 
 msgid "Protocol"
 msgstr "Protocole"
@@ -180,18 +180,19 @@ msgstr "Fichier Audio"
 msgid "Preferences"
 msgstr "Préférences"
 
-msgid "Accounts"
-msgstr "Comptes"
+msgid "_Accounts"
+msgstr "Co_mptes"
 
 msgid "Audio Settings"
 msgstr "Paramètres Audio"
 
 #: ../actions.c:45
 #, c-format
-msgid "%d new voice mail%s"
-msgid_plural "%d new voice mail%s"
-msgstr[0] "%d nouveau message vocal%0s"
-msgstr[1] "%d nouveaux messages vocaux%0s"
+msgid "%d new voice mail"
+msgstr "%d nouveau message vocal"
+
+msgid "%d new voice mails"
+msgstr "%d nouveaux messages vocaux"
 
 # SIP registration state
 msgid "Registered"