diff --git a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml b/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
index 05e6d554c3aef376d5592d3c3eb99ed37b253d41..7e3888c2338960ea9c20d4d0d7e0fed94c09a4cf 100644
--- a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
+++ b/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
@@ -310,7 +310,7 @@
     </method>
 
     <method name="getHistory">
-        <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
+        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
         <arg type="a{ss}" name="entries" direction="out"/>
     </method>
 
diff --git a/sflphone-client-kde/po/README b/sflphone-client-kde/po/README
index 2fbea68fa4f7d87d731b243af1aa6efbac6fe7cf..ab2bcad9f3573ccd744aa27f191b2d5eedafdcb8 100644
--- a/sflphone-client-kde/po/README
+++ b/sflphone-client-kde/po/README
@@ -1,7 +1,14 @@
- 
-If we need to update translations files, do the following steps:
+If you need to update translations files, just execute:
 
-	xgettext --c++ --kde -ktr2i18n -o sflphone-client-kde.pot ../src/*.cpp ../src/*.h ../build/src/*.h ../build/src/*.cpp
+	./update.sh
+	
+in the current directory.
+
+
+
+If you want to do it yourself, do the following steps:
+
+	xgettext --c++ --kde -ktr2i18n -kki18nc:2c,1 -kki18n -o sflphone-client-kde.pot ../src/*.cpp ../src/*.h ../build/src/*.h ../build/src/*.cpp
 
 This command will update the template file with the current source files.
 To be able to add strings from the ui files, and other non-c++ files which generates some c++ source, you have to first build and make the project in build directory (see the INSTALL file in root directory sflphone-client-kde).
diff --git a/sflphone-client-kde/po/de/sflphone-client-kde.po b/sflphone-client-kde/po/de/sflphone-client-kde.po
index c5a5d7703a2546e0c4228566c87a672e3ce890d8..ccbeede61592a5763e3af4c480a68b36ed2542a1 100644
--- a/sflphone-client-kde/po/de/sflphone-client-kde.po
+++ b/sflphone-client-kde/po/de/sflphone-client-kde.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-09 18:40-0400\n"
+"POT-Creation-Date: 2009-06-17 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -151,50 +151,60 @@ msgstr ""
 msgid "Transfer to : "
 msgstr ""
 
-#: ../src/ConfigDialog.cpp:131
+#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263
 msgid "Attention : SIP port must be over 1024 !"
 msgstr ""
 
-#: ../src/ConfigDialog.cpp:136
+#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266
 msgid "Attention : SIP port must be under 65536 !"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:54 ../src/sflphone_kdeview.cpp:1055
-#: ../src/sflphone_kdeview.cpp:1060 ../src/sflphone_kdeview.cpp:1065
+#: ../src/main.cpp:49 ../src/main.cpp:50
+msgctxt "Your names"
+msgid "NAME OF TRANSLATORS"
+msgstr ""
+
+#: ../src/main.cpp:50 ../src/main.cpp:51
+msgctxt "Your emails"
+msgid "EMAIL OF TRANSLATORS"
+msgstr ""
+
+#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051
+#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061
 msgid "SFLPhone"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:152
+#: ../src/SFLPhone.cpp:154
 msgid "You still have some calls open. Please close all calls before quitting."
 msgstr ""
 
-#: ../src/SFLPhone.cpp:180
+#: ../src/SFLPhone.cpp:182
 msgid "Incoming call"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:181
+#: ../src/SFLPhone.cpp:183
 msgid "You have an incoming call from"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:181
+#: ../src/SFLPhone.cpp:183
 msgid "Click to accept or refuse it."
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1055
+#: ../src/sflphone_kdeview.cpp:1051
 msgid "Main screen"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1060 ../build/src/ui_ConfigDialog.h:1271
+#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271
 #: ../build/src/ui_dlggeneralbase.h:160
 msgid "Call history"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1065
+#: ../src/sflphone_kdeview.cpp:1061
 #: ../build/src/ui_sflphone_kdeview_base.h:507
 msgid "Address book"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1079 ../src/sflphone_kdeview.cpp:1135
+#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131
 msgid "Edit before call"
 msgstr ""
 
diff --git a/sflphone-client-kde/po/es/sflphone-client-kde.po b/sflphone-client-kde/po/es/sflphone-client-kde.po
index ba7f9509aa129a84a36f19832397b6d43efa250d..d8af45b68bdc669a021952c89c623dfdfc4621c0 100644
--- a/sflphone-client-kde/po/es/sflphone-client-kde.po
+++ b/sflphone-client-kde/po/es/sflphone-client-kde.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-09 18:40-0400\n"
+"POT-Creation-Date: 2009-06-17 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -151,50 +151,60 @@ msgstr ""
 msgid "Transfer to : "
 msgstr ""
 
-#: ../src/ConfigDialog.cpp:131
+#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263
 msgid "Attention : SIP port must be over 1024 !"
 msgstr ""
 
-#: ../src/ConfigDialog.cpp:136
+#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266
 msgid "Attention : SIP port must be under 65536 !"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:54 ../src/sflphone_kdeview.cpp:1055
-#: ../src/sflphone_kdeview.cpp:1060 ../src/sflphone_kdeview.cpp:1065
+#: ../src/main.cpp:49 ../src/main.cpp:50
+msgctxt "Your names"
+msgid "NAME OF TRANSLATORS"
+msgstr ""
+
+#: ../src/main.cpp:50 ../src/main.cpp:51
+msgctxt "Your emails"
+msgid "EMAIL OF TRANSLATORS"
+msgstr ""
+
+#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051
+#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061
 msgid "SFLPhone"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:152
+#: ../src/SFLPhone.cpp:154
 msgid "You still have some calls open. Please close all calls before quitting."
 msgstr ""
 
-#: ../src/SFLPhone.cpp:180
+#: ../src/SFLPhone.cpp:182
 msgid "Incoming call"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:181
+#: ../src/SFLPhone.cpp:183
 msgid "You have an incoming call from"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:181
+#: ../src/SFLPhone.cpp:183
 msgid "Click to accept or refuse it."
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1055
+#: ../src/sflphone_kdeview.cpp:1051
 msgid "Main screen"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1060 ../build/src/ui_ConfigDialog.h:1271
+#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271
 #: ../build/src/ui_dlggeneralbase.h:160
 msgid "Call history"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1065
+#: ../src/sflphone_kdeview.cpp:1061
 #: ../build/src/ui_sflphone_kdeview_base.h:507
 msgid "Address book"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1079 ../src/sflphone_kdeview.cpp:1135
+#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131
 msgid "Edit before call"
 msgstr ""
 
diff --git a/sflphone-client-kde/po/fr/sflphone-client-kde.po b/sflphone-client-kde/po/fr/sflphone-client-kde.po
index 4086fe3d2273e7b2fa181ca82726cddf2d443736..fd63212aef25485185116a924b09f45c5cee4c8d 100644
--- a/sflphone-client-kde/po/fr/sflphone-client-kde.po
+++ b/sflphone-client-kde/po/fr/sflphone-client-kde.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-09 18:40-0400\n"
+"POT-Creation-Date: 2009-06-17 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -166,52 +166,62 @@ msgstr ""
 msgid "Transfer to : "
 msgstr " Transférer à : "
 
-#: ../src/ConfigDialog.cpp:131
+#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263
 msgid "Attention : SIP port must be over 1024 !"
 msgstr "Attention : le port SIP doit être supérieur à 1024 !"
 
-#: ../src/ConfigDialog.cpp:136
+#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266
 msgid "Attention : SIP port must be under 65536 !"
 msgstr "Attention : le port SIP doit être inférieur à 65536 !"
 
-#: ../src/SFLPhone.cpp:54 ../src/sflphone_kdeview.cpp:1055
-#: ../src/sflphone_kdeview.cpp:1060 ../src/sflphone_kdeview.cpp:1065
+#: ../src/main.cpp:49 ../src/main.cpp:50
+msgctxt "Your names"
+msgid "NAME OF TRANSLATORS"
+msgstr ""
+
+#: ../src/main.cpp:50 ../src/main.cpp:51
+msgctxt "Your emails"
+msgid "EMAIL OF TRANSLATORS"
+msgstr ""
+
+#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051
+#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061
 msgid "SFLPhone"
 msgstr "SFLPhone"
 
-#: ../src/SFLPhone.cpp:152
+#: ../src/SFLPhone.cpp:154
 msgid "You still have some calls open. Please close all calls before quitting."
 msgstr ""
 "Il reste des appels ouverts. Veuillez les raccrocher avant de quitter "
 "l'application."
 
-#: ../src/SFLPhone.cpp:180
+#: ../src/SFLPhone.cpp:182
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: ../src/SFLPhone.cpp:181
+#: ../src/SFLPhone.cpp:183
 msgid "You have an incoming call from"
 msgstr "Vous avez un appel entrant de"
 
-#: ../src/SFLPhone.cpp:181
+#: ../src/SFLPhone.cpp:183
 msgid "Click to accept or refuse it."
 msgstr "Cliquez sur ce message pour accepter ou refuser"
 
-#: ../src/sflphone_kdeview.cpp:1055
+#: ../src/sflphone_kdeview.cpp:1051
 msgid "Main screen"
 msgstr "Écran principal"
 
-#: ../src/sflphone_kdeview.cpp:1060 ../build/src/ui_ConfigDialog.h:1271
+#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271
 #: ../build/src/ui_dlggeneralbase.h:160
 msgid "Call history"
 msgstr "Historique d'appel"
 
-#: ../src/sflphone_kdeview.cpp:1065
+#: ../src/sflphone_kdeview.cpp:1061
 #: ../build/src/ui_sflphone_kdeview_base.h:507
 msgid "Address book"
 msgstr "Carnet d'adresse"
 
-#: ../src/sflphone_kdeview.cpp:1079 ../src/sflphone_kdeview.cpp:1135
+#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131
 msgid "Edit before call"
 msgstr "Éditer avant d'appeler"
 
diff --git a/sflphone-client-kde/po/ru/sflphone-client-kde.po b/sflphone-client-kde/po/ru/sflphone-client-kde.po
index 63b2cc6c192a3eccd42fa8cb696241e22ec15e79..d8af45b68bdc669a021952c89c623dfdfc4621c0 100644
--- a/sflphone-client-kde/po/ru/sflphone-client-kde.po
+++ b/sflphone-client-kde/po/ru/sflphone-client-kde.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-09 19:00-0400\n"
+"POT-Creation-Date: 2009-06-17 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -151,50 +151,60 @@ msgstr ""
 msgid "Transfer to : "
 msgstr ""
 
-#: ../src/ConfigDialog.cpp:131
+#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263
 msgid "Attention : SIP port must be over 1024 !"
 msgstr ""
 
-#: ../src/ConfigDialog.cpp:136
+#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266
 msgid "Attention : SIP port must be under 65536 !"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:54 ../src/sflphone_kdeview.cpp:1055
-#: ../src/sflphone_kdeview.cpp:1060 ../src/sflphone_kdeview.cpp:1065
+#: ../src/main.cpp:49 ../src/main.cpp:50
+msgctxt "Your names"
+msgid "NAME OF TRANSLATORS"
+msgstr ""
+
+#: ../src/main.cpp:50 ../src/main.cpp:51
+msgctxt "Your emails"
+msgid "EMAIL OF TRANSLATORS"
+msgstr ""
+
+#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051
+#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061
 msgid "SFLPhone"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:152
+#: ../src/SFLPhone.cpp:154
 msgid "You still have some calls open. Please close all calls before quitting."
 msgstr ""
 
-#: ../src/SFLPhone.cpp:180
+#: ../src/SFLPhone.cpp:182
 msgid "Incoming call"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:181
+#: ../src/SFLPhone.cpp:183
 msgid "You have an incoming call from"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:181
+#: ../src/SFLPhone.cpp:183
 msgid "Click to accept or refuse it."
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1055
+#: ../src/sflphone_kdeview.cpp:1051
 msgid "Main screen"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1060 ../build/src/ui_ConfigDialog.h:1271
+#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271
 #: ../build/src/ui_dlggeneralbase.h:160
 msgid "Call history"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1065
+#: ../src/sflphone_kdeview.cpp:1061
 #: ../build/src/ui_sflphone_kdeview_base.h:507
 msgid "Address book"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1079 ../src/sflphone_kdeview.cpp:1135
+#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131
 msgid "Edit before call"
 msgstr ""
 
diff --git a/sflphone-client-kde/po/sflphone-client-kde.pot b/sflphone-client-kde/po/sflphone-client-kde.pot
index e8ab6fe12be027d7964b7e053f2d893ef6068602..3bf4ef029eed187fca57085a05532be356a43121 100644
--- a/sflphone-client-kde/po/sflphone-client-kde.pot
+++ b/sflphone-client-kde/po/sflphone-client-kde.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-09 19:00-0400\n"
+"POT-Creation-Date: 2009-06-17 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -151,50 +151,60 @@ msgstr ""
 msgid "Transfer to : "
 msgstr ""
 
-#: ../src/ConfigDialog.cpp:131
+#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263
 msgid "Attention : SIP port must be over 1024 !"
 msgstr ""
 
-#: ../src/ConfigDialog.cpp:136
+#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266
 msgid "Attention : SIP port must be under 65536 !"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:54 ../src/sflphone_kdeview.cpp:1055
-#: ../src/sflphone_kdeview.cpp:1060 ../src/sflphone_kdeview.cpp:1065
+#: ../src/main.cpp:49 ../src/main.cpp:50
+msgctxt "Your names"
+msgid "NAME OF TRANSLATORS"
+msgstr ""
+
+#: ../src/main.cpp:50 ../src/main.cpp:51
+msgctxt "Your emails"
+msgid "EMAIL OF TRANSLATORS"
+msgstr ""
+
+#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051
+#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061
 msgid "SFLPhone"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:152
+#: ../src/SFLPhone.cpp:154
 msgid "You still have some calls open. Please close all calls before quitting."
 msgstr ""
 
-#: ../src/SFLPhone.cpp:180
+#: ../src/SFLPhone.cpp:182
 msgid "Incoming call"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:181
+#: ../src/SFLPhone.cpp:183
 msgid "You have an incoming call from"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:181
+#: ../src/SFLPhone.cpp:183
 msgid "Click to accept or refuse it."
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1055
+#: ../src/sflphone_kdeview.cpp:1051
 msgid "Main screen"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1060 ../build/src/ui_ConfigDialog.h:1271
+#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271
 #: ../build/src/ui_dlggeneralbase.h:160
 msgid "Call history"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1065
+#: ../src/sflphone_kdeview.cpp:1061
 #: ../build/src/ui_sflphone_kdeview_base.h:507
 msgid "Address book"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1079 ../src/sflphone_kdeview.cpp:1135
+#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131
 msgid "Edit before call"
 msgstr ""
 
diff --git a/sflphone-client-kde/po/update.sh b/sflphone-client-kde/po/update.sh
index ccf5a3589ee5a93d8a1b29af389be5effb850f8b..4c0188296d9194b1343e761e27b9e63f5cdb9ead 100755
--- a/sflphone-client-kde/po/update.sh
+++ b/sflphone-client-kde/po/update.sh
@@ -1,4 +1,4 @@
-xgettext --c++ --kde -ktr2i18n -o sflphone-client-kde.pot ../src/*.cpp ../src/*.h ../build/src/*.h ../build/src/*.cpp
+xgettext --c++ --kde -ktr2i18n -kki18nc:2c,1 -kki18n -o sflphone-client-kde.pot ../src/*.cpp ../src/*.h ../build/src/*.h ../build/src/*.cpp
 
 for fichier in `find  .  -name *.po `
 do
diff --git a/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po b/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po
index ba7f9509aa129a84a36f19832397b6d43efa250d..d8af45b68bdc669a021952c89c623dfdfc4621c0 100644
--- a/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po
+++ b/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-09 18:40-0400\n"
+"POT-Creation-Date: 2009-06-17 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -151,50 +151,60 @@ msgstr ""
 msgid "Transfer to : "
 msgstr ""
 
-#: ../src/ConfigDialog.cpp:131
+#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263
 msgid "Attention : SIP port must be over 1024 !"
 msgstr ""
 
-#: ../src/ConfigDialog.cpp:136
+#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266
 msgid "Attention : SIP port must be under 65536 !"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:54 ../src/sflphone_kdeview.cpp:1055
-#: ../src/sflphone_kdeview.cpp:1060 ../src/sflphone_kdeview.cpp:1065
+#: ../src/main.cpp:49 ../src/main.cpp:50
+msgctxt "Your names"
+msgid "NAME OF TRANSLATORS"
+msgstr ""
+
+#: ../src/main.cpp:50 ../src/main.cpp:51
+msgctxt "Your emails"
+msgid "EMAIL OF TRANSLATORS"
+msgstr ""
+
+#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051
+#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061
 msgid "SFLPhone"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:152
+#: ../src/SFLPhone.cpp:154
 msgid "You still have some calls open. Please close all calls before quitting."
 msgstr ""
 
-#: ../src/SFLPhone.cpp:180
+#: ../src/SFLPhone.cpp:182
 msgid "Incoming call"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:181
+#: ../src/SFLPhone.cpp:183
 msgid "You have an incoming call from"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:181
+#: ../src/SFLPhone.cpp:183
 msgid "Click to accept or refuse it."
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1055
+#: ../src/sflphone_kdeview.cpp:1051
 msgid "Main screen"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1060 ../build/src/ui_ConfigDialog.h:1271
+#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271
 #: ../build/src/ui_dlggeneralbase.h:160
 msgid "Call history"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1065
+#: ../src/sflphone_kdeview.cpp:1061
 #: ../build/src/ui_sflphone_kdeview_base.h:507
 msgid "Address book"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1079 ../src/sflphone_kdeview.cpp:1135
+#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131
 msgid "Edit before call"
 msgstr ""
 
diff --git a/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po b/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po
index ba7f9509aa129a84a36f19832397b6d43efa250d..d8af45b68bdc669a021952c89c623dfdfc4621c0 100644
--- a/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po
+++ b/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-09 18:40-0400\n"
+"POT-Creation-Date: 2009-06-17 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -151,50 +151,60 @@ msgstr ""
 msgid "Transfer to : "
 msgstr ""
 
-#: ../src/ConfigDialog.cpp:131
+#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263
 msgid "Attention : SIP port must be over 1024 !"
 msgstr ""
 
-#: ../src/ConfigDialog.cpp:136
+#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266
 msgid "Attention : SIP port must be under 65536 !"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:54 ../src/sflphone_kdeview.cpp:1055
-#: ../src/sflphone_kdeview.cpp:1060 ../src/sflphone_kdeview.cpp:1065
+#: ../src/main.cpp:49 ../src/main.cpp:50
+msgctxt "Your names"
+msgid "NAME OF TRANSLATORS"
+msgstr ""
+
+#: ../src/main.cpp:50 ../src/main.cpp:51
+msgctxt "Your emails"
+msgid "EMAIL OF TRANSLATORS"
+msgstr ""
+
+#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051
+#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061
 msgid "SFLPhone"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:152
+#: ../src/SFLPhone.cpp:154
 msgid "You still have some calls open. Please close all calls before quitting."
 msgstr ""
 
-#: ../src/SFLPhone.cpp:180
+#: ../src/SFLPhone.cpp:182
 msgid "Incoming call"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:181
+#: ../src/SFLPhone.cpp:183
 msgid "You have an incoming call from"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:181
+#: ../src/SFLPhone.cpp:183
 msgid "Click to accept or refuse it."
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1055
+#: ../src/sflphone_kdeview.cpp:1051
 msgid "Main screen"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1060 ../build/src/ui_ConfigDialog.h:1271
+#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271
 #: ../build/src/ui_dlggeneralbase.h:160
 msgid "Call history"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1065
+#: ../src/sflphone_kdeview.cpp:1061
 #: ../build/src/ui_sflphone_kdeview_base.h:507
 msgid "Address book"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1079 ../src/sflphone_kdeview.cpp:1135
+#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131
 msgid "Edit before call"
 msgstr ""
 
diff --git a/sflphone-client-kde/src/Call.cpp b/sflphone-client-kde/src/Call.cpp
index 6dcbc48280673542daf7ea38aa7c5a04d4203e92..68b99d7fc0bbec73a0615e560159c37a58fd5d72 100644
--- a/sflphone-client-kde/src/Call.cpp
+++ b/sflphone-client-kde/src/Call.cpp
@@ -563,12 +563,13 @@ void Call::appendItemText(QString text)
 			break;
 		case CALL_STATE_CURRENT:
 			//TODO replace account string by an Account instance and handle damn pointers to avoid detruction of Accounts
-			//if(peer == account->getAccountDetail(ACCOUNT_MAILBOX))
-			if(peerPhoneNumber == configurationManager.getAccountDetails(account).value()[ACCOUNT_MAILBOX])
-			{
-				text = QString(QChar(0x9A));
-			}
+// 			if(peerPhoneNumber == configurationManager.getAccountDetails(account).value()[ACCOUNT_MAILBOX])
+// 			{
+// 				text = QString(QChar(0x9A));
+// 			}
+			text = QString();
 			editNumber = labelCallNumber;
+			
 			break;		
 		default:
 			qDebug() << "Type key on call not editable. Doing nothing.";
diff --git a/sflphone-client-kde/src/ConfigDialog.cpp b/sflphone-client-kde/src/ConfigDialog.cpp
index 308576a75a62ffaa6b5451ac54407e7567f75bbf..ea604136da422e38bf82efd9424d3dc0689dd885 100644
--- a/sflphone-client-kde/src/ConfigDialog.cpp
+++ b/sflphone-client-kde/src/ConfigDialog.cpp
@@ -122,7 +122,7 @@ void ConfigurationDialog::loadOptions()
 	////////////////////////
 	
 	//Call history settings
-	spinBox_historyCapacity->setValue(configurationManager.getMaxCalls());
+	spinBox_historyCapacity->setValue(configurationManager.getHistoryLimit());
 	
 	//SIP port settings
 	int sipPort = configurationManager.getSipPort();
@@ -254,16 +254,16 @@ void ConfigurationDialog::saveOptions()
 	////////////////////////
 	
 	//Call history settings
-	configurationManager.setMaxCalls(spinBox_historyCapacity->value());
+	configurationManager.setHistoryLimit(spinBox_historyCapacity->value());
 	
 	//SIP port settings
 	int sipPort = spinBox_SIPPort->value();
 	
 	if(sipPort<1025){
-		errorWindow->showMessage("Attention : le port SIP doit être supérieur à 1024 !");
+		errorWindow->showMessage(tr2i18n("Attention : SIP port must be over 1024 !"));
 	}
 	if(sipPort>65535){
-		errorWindow->showMessage("Attention : le port SIP doit être inférieur à 65536 !");
+		errorWindow->showMessage(tr2i18n("Attention : SIP port must be under 65536 !"));
 	}
 	configurationManager.setSipPort(sipPort);
 	
diff --git a/sflphone-client-kde/src/SFLPhone.cpp b/sflphone-client-kde/src/SFLPhone.cpp
index acc374710648690ea86e7cf2ff3952d41ff3f749..e30be21a897cb3d565873fad4d80b9fd450c87a6 100644
--- a/sflphone-client-kde/src/SFLPhone.cpp
+++ b/sflphone-client-kde/src/SFLPhone.cpp
@@ -27,6 +27,7 @@
 #include <KMenu>
 #include <KAction>
 #include <KToolBar>
+#include <KStatusBar>
 #include <QtGui/QStatusBar>
 #include <KActionCollection>
 
@@ -71,6 +72,7 @@ SFLPhone::SFLPhone(QWidget *parent)
 		createGUI(rcFilePath);
 
       QMetaObject::connectSlotsByName(this);
+      
 
 } 
 
@@ -223,4 +225,9 @@ void SFLPhone::on_trayIcon_activated(QSystemTrayIcon::ActivationReason reason)
 }
 
 
+void SFLPhone::on_view_statusMessageChanged(QString message)
+{
+	qDebug() << "on_view_statusMessageChanged";
+	statusBar()->showMessage(message);
+}
 
diff --git a/sflphone-client-kde/src/SFLPhone.h b/sflphone-client-kde/src/SFLPhone.h
index 94213bdeeabac1434b9b7b4f3a945dcda5ab9f67..8ab101402fbadb8da1217b798f96bd9663088731 100644
--- a/sflphone-client-kde/src/SFLPhone.h
+++ b/sflphone-client-kde/src/SFLPhone.h
@@ -70,6 +70,7 @@ public:
 private slots:
 	void on_trayIcon_activated(QSystemTrayIcon::ActivationReason reason);
 	void on_trayIcon_messageClicked();
+	void on_view_statusMessageChanged(QString message);
 
 	void quitButton();
 
diff --git a/sflphone-client-kde/src/dbus/callmanager-introspec.xml b/sflphone-client-kde/src/dbus/callmanager-introspec.xml
index dbc84d3542c77ceba6beb6f07f3904aa2e4d8ce8..e9130e9a91a8d7bf17f3dc43180f33d1e11438e4 100644
--- a/sflphone-client-kde/src/dbus/callmanager-introspec.xml
+++ b/sflphone-client-kde/src/dbus/callmanager-introspec.xml
@@ -1,120 +1,129 @@
 <?xml version="1.0" ?>
 <node name="/org/sflphone/SFLphone">
-  <interface name="org.sflphone.SFLphone.CallManager">
-  
-    <method name="placeCall">
-      <arg type="s" name="accountID" direction="in"/>
-      <arg type="s" name="callID" direction="in"/>
-      <arg type="s" name="to" direction="in"/>
-    </method>
-    
-    <method name="refuse">
-      <arg type="s" name="callID" direction="in"/>
-    </method>
-    
-    <method name="accept">
-      <arg type="s" name="callID" direction="in"/>
-    </method>
-    
-    <method name="hangUp">
-      <arg type="s" name="callID" direction="in"/>
-    </method>
-    
-    <method name="hold">
-      <arg type="s" name="callID" direction="in"/>
-    </method>
-    
-    <method name="unhold">
-      <arg type="s" name="callID" direction="in"/>
-    </method>
-    
-    <method name="transfert">
-      <arg type="s" name="callID" direction="in"/>
-      <arg type="s" name="to" direction="in"/>
-    </method>
-    
-    <method name="playDTMF">
-      <arg type="s" name="key" direction="in"/>
-    </method>
-    
-    <method name="startTone">
-      <arg type="i" name="start" direction="in"/>
-      <arg type="i" name="type" direction="in"/>
-    </method>
-
-    <method name="setVolume">
-      <arg type="s" name="device" direction="in"/>
-      <arg type="d" name="value" direction="in"/>
-    </method>
-    
-    <method name="getVolume">
-      <arg type="s" name="device" direction="in"/>
-      <arg type="d" name="value" direction="out"/>
-    </method>
-
-    <method name="setRecording">
-      <arg type="s" name="callID" direction="in"/>
-    </method>
-
-     <method name="getIsRecording">
-      <arg type="s" name="callID" direction="in"/>
-      <arg type="b" name="isRecording" direction="out"/>
-    </method>
-    
-    <method name="getCallDetails">
-      <arg type="s" name="callID" direction="in"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
-      <arg type="a{ss}" name="infos" direction="out"/>
-    </method>
-    
-    <method name="getCurrentCallID">
-      <arg type="s" name="callID" direction="out"/>
-    </method>
-
-    <method name="getCurrentCodecName">
-      <arg type="s" name="callID" direction="in"/>
-      <arg type="s" name="codecName" direction="out"/>
-    </method>
-
-    <signal name="currentSelectedCodec">
-      <arg type="s" name="callID"  direction="out" />
-      <arg type="s" name="codecName"  direction="out"/>
-    </signal>
-    
-    <signal name="incomingCall">
-      <arg type="s" name="accountID" />
-      <arg type="s" name="callID" />
-      <arg type="s" name="from" />
-    </signal>
-    
-    <signal name="incomingMessage">
-      <arg type="s" name="accountID"  direction="out" />
-      <arg type="s" name="message"  direction="out"/>
-    </signal>
-    
-    <signal name="callStateChanged">
-      <arg type="s" name="callID"  direction="out"/>
-      <arg type="s" name="state"  direction="out"/>
-    </signal>
-    
-    <signal name="voiceMailNotify">
-      <arg type="s" name="accountID"  direction="out"/>
-      <arg type="i" name="count"  direction="out"/>
-    </signal>
-    
-    
-    <signal name="volumeChanged">
-      <arg type="s" name="device"  direction="out"/>
-      <arg type="d" name="value"  direction="out"/>
-    </signal>
- 
-<!--
-    <signal name="error">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
-      <arg type="a{ss}" name="details"  direction="out"/>
-    </signal>
--->
-
-  </interface>
-</node>
+	<interface name="org.sflphone.SFLphone.CallManager">
+		
+		<method name="placeCall">
+			<arg type="s" name="accountID" direction="in"/>
+			<arg type="s" name="callID" direction="in"/>
+			<arg type="s" name="to" direction="in"/>
+		</method>
+		
+		<method name="refuse">
+			<arg type="s" name="callID" direction="in"/>
+		</method>
+		
+		<method name="accept">
+			<arg type="s" name="callID" direction="in"/>
+		</method>
+		
+		<method name="hangUp">
+			<arg type="s" name="callID" direction="in"/>
+		</method>
+		
+		<method name="hold">
+			<arg type="s" name="callID" direction="in"/>
+		</method>
+		
+		<method name="unhold">
+			<arg type="s" name="callID" direction="in"/>
+		</method>
+		
+		<method name="transfert">
+			<arg type="s" name="callID" direction="in"/>
+			<arg type="s" name="to" direction="in"/>
+		</method>
+		
+		<method name="playDTMF">
+			<arg type="s" name="key" direction="in"/>
+		</method>
+		
+		<method name="startTone">
+			<arg type="i" name="start" direction="in"/>
+			<arg type="i" name="type" direction="in"/>
+		</method>
+		
+		<method name="setVolume">
+			<arg type="s" name="device" direction="in"/>
+			<arg type="d" name="value" direction="in"/>
+		</method>
+		
+		<method name="getVolume">
+			<arg type="s" name="device" direction="in"/>
+			<arg type="d" name="value" direction="out"/>
+		</method>
+		
+		<method name="setRecording">
+			<arg type="s" name="callID" direction="in"/>
+		</method>
+		
+		<method name="getIsRecording">
+			<arg type="s" name="callID" direction="in"/>
+			<arg type="b" name="isRecording" direction="out"/>
+		</method>
+		
+		<method name="getCallDetails">
+			<arg type="s" name="callID" direction="in"/>
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+			<arg type="a{ss}" name="infos" direction="out"/>
+		</method>
+		
+		<method name="getCallList">
+			<arg type="as" name="list" direction="out"/>
+		</method>
+		
+		<method name="getCurrentCallID">
+			<arg type="s" name="callID" direction="out"/>
+		</method>
+		
+		<method name="getCurrentCodecName">
+			<arg type="s" name="callID" direction="in"/>
+			<arg type="s" name="codecName" direction="out"/>
+		</method>
+		
+		<signal name="currentSelectedCodec">
+			<arg type="s" name="callID"  direction="out" />
+			<arg type="s" name="codecName"  direction="out"/>
+		</signal>
+		
+		<signal name="incomingCall">
+			<arg type="s" name="accountID" />
+			<arg type="s" name="callID" />
+			<arg type="s" name="from" />
+		</signal>
+		
+		<signal name="incomingMessage">
+			<arg type="s" name="accountID"  direction="out" />
+			<arg type="s" name="message"  direction="out"/>
+		</signal>
+		
+		<signal name="callStateChanged">
+			<arg type="s" name="callID"  direction="out"/>
+			<arg type="s" name="state"  direction="out"/>
+		</signal>
+		
+		<signal name="voiceMailNotify">
+			<arg type="s" name="accountID"  direction="out"/>
+			<arg type="i" name="count"  direction="out"/>
+		</signal>
+		
+		<signal name="volumeChanged">
+			<arg type="s" name="device"  direction="out"/>
+			<arg type="d" name="value"  direction="out"/>
+		</signal>
+		
+		<signal name="transferSucceded">
+		</signal>
+		
+		<signal name="transferFailed">
+		</signal>
+		
+		<!--
+			 <signal name="error">
+				 <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
+				 <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+				 <arg type="a{ss}" name="details"  direction="out"/>
+			 </signal>
+			 -->
+			 
+		 </interface>
+	 </node>
diff --git a/sflphone-client-kde/src/dbus/configurationmanager-introspec.xml b/sflphone-client-kde/src/dbus/configurationmanager-introspec.xml
index 9a4375bb0cfce1a67ff8790ae119202015d0ce16..cb587f3e3f60c8455834926f2909ecf800b9158b 100644
--- a/sflphone-client-kde/src/dbus/configurationmanager-introspec.xml
+++ b/sflphone-client-kde/src/dbus/configurationmanager-introspec.xml
@@ -1,323 +1,340 @@
 <?xml version="1.0" ?>
 <node name="/org/sflphone/SFLphone">
-  <interface name="org.sflphone.SFLphone.ConfigurationManager">
-    
-  <!-- Accounts-related methods -->  
-    <method name="getAccountDetails">
-      <arg type="s" name="accountID" direction="in"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
-      <arg type="a{ss}" name="details" direction="out"/>
-    </method>
-    
-    <method name="setAccountDetails">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="MapStringString"/>
-      <arg type="s" name="accountID" direction="in"/>
-      <arg type="a{ss}" name="details" direction="in"/>
-    </method>
-    
-    <method name="addAccount">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
-      <arg type="a{ss}" name="details" direction="in"/>
-      <arg type="s" name="createdAccountId" direction="out"/>
-    </method>
-    
-    <method name="setAccountsOrder">
-      <arg type="s" name="order" direction="in"/>
-    </method>
-    
-    <method name="removeAccount">
-      <arg type="s" name="accoundID" direction="in"/>
-    </method>
-    
-    <method name="getAccountList">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
-      <arg type="as" name="list" direction="out"/>
-    </method>
-   
-    <method name="sendRegister">
-      <arg type="s" name="accountID" direction="in"/>
-      <arg type="i" name="expire" direction="in"/>
-    </method>
-
-   <!--      ///////////////////////               -->
-
-  <!-- Various audio-related methods   -->
- 
-    <method name="getToneLocaleList">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
-      <arg type="as" name="list" direction="out"/>
-    </method>
-  
-    <method name="getVersion">
-      <arg type="s" name="version" direction="out"/>
-    </method>
-    
-    <method name="getRingtoneList">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
-      <arg type="as" name="list" direction="out"/>
-    </method>
-   
-    <method name="getPlaybackDeviceList">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
-      <arg type="as" name="list" direction="out"/>
-    </method>
-    
-    <method name="getRecordDeviceList">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
-      <arg type="as" name="list" direction="out"/>
-    </method>
-    
-    <method name="isRingtoneEnabled">
-      <arg type="i" name="bool" direction="out"/>
-    </method>
-
-    <method name="ringtoneEnabled">
-    </method>
-
-    <method name="getRingtoneChoice">
-      <arg type="s" name="tone" direction="out"/>
-    </method>
-
-    <method name="setRingtoneChoice">
-      <arg type="s" name="tone" direction="in"/>
-    </method>
-
-    <method name="getAudioManager">
-      <arg type="i" name="api" direction="out"/>
-    </method>
-
-    <method name="setAudioManager">
-      <arg type="i" name="api" direction="in"/>
-    </method>
-    
-    <method name="getRecordPath">
-      <arg type="s" name="rec" direction="out"/>
-    </method>
-
-    <method name="setRecordPath">
-      <arg type="s" name="rec" direction="in"/>
-    </method>
-
-   <!--      ///////////////////////               -->
-   
-   <!-- Codecs-related methods -->
- 
-    <method name="getCodecList">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
-      <arg type="as" name="list" direction="out"/>
-    </method>
-   
-   <method name="getCodecDetails">
-     <arg type="i" name="payload" direction="in"/>
-     <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
-     <arg type="as" name="details" direction="out"/>
-   </method>
- 
-    <method name="getActiveCodecList">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
-      <arg type="as" name="list" direction="out"/>
-    </method>
-
-    <method name="setActiveCodecList">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="VectorString"/>
-      <arg type="as" name="list" direction="in"/>
-    </method>
-
-
-	<!-- Audio devices methods -->
-	
-    <method name="getInputAudioPluginList">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
-      <arg type="as" name="list" direction="out"/>
-    </method>
-		
-    <method name="getOutputAudioPluginList">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
-      <arg type="as" name="list" direction="out"/>
-    </method>
-    
-    <method name="setInputAudioPlugin">
-      <arg type="s" name="audioPlugin" direction="in"/>
-    </method>
-    
-    <method name="setOutputAudioPlugin">
-      <arg type="s" name="audioPlugin" direction="in"/>
-    </method>
-    
-    <method name="getAudioOutputDeviceList">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
-      <arg type="as" name="list" direction="out"/>
-    </method>
-    
-    <method name="setAudioOutputDevice">
-      <arg type="i" name="index" direction="in"/>
-    </method>
-    
-    <method name="getAudioInputDeviceList">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
-      <arg type="as" name="list" direction="out"/>
-    </method>
-    
-    <method name="setAudioInputDevice">
-      <arg type="i" name="index" direction="in"/>
-    </method>
-    
-    <method name="getCurrentAudioDevicesIndex">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
-      <arg type="as" name="list" direction="out"/>
-    </method>
-
-    <method name="getAudioDeviceIndex">
-      <arg type="s" name="name" direction="in"/>
-      <arg type="i" name="index" direction="out"/>
-    </method>
-
-    <method name="getCurrentAudioOutputPlugin">
-      <arg type="s" name="plugin" direction="out"/>
-    </method>
-
-  <!--    General Settings Panel         -->
- 
-    <method name="isIax2Enabled">
-      <arg type="i" name="res" direction="out"/>
-    </method>
-
-    <method name="setNotify">
-    </method>
-
-    <method name="getNotify">
-      <arg type="i" name="level" direction="out"/>
-    </method>
-
-    <method name="setMailNotify">
-    </method>
-
-    <method name="getMailNotify">
-      <arg type="i" name="level" direction="out"/>
-    </method>
-
-    <method name="getDialpad">
-      <arg type="i" name="state" direction="out"/>
-    </method>
-
-    <method name="setDialpad">
-    </method>
-
-    <method name="getSearchbar">
-      <arg type="i" name="state" direction="out"/>
-    </method>
-
-    <method name="setSearchbar">
-    </method>
-
-    <method name="getVolumeControls">
-      <arg type="i" name="state" direction="out"/>
-    </method>
-
-    <method name="setVolumeControls">
-    </method>
-
-    <method name="getMaxCalls">
-      <arg type="i" name="calls" direction="out"/>
-    </method>
-
-    <method name="setMaxCalls">
-      <arg type="i" name="calls" direction="in"/>
-    </method>
-
-    <method name="startHidden">
-    </method>
-
-    <method name="isStartHidden">
-      <arg type="i" name="state" direction="out"/>
-    </method>
-
-    <method name="popupMode">
-      <arg type="i" name="state" direction="out"/>
-    </method>
-
-    <method name="switchPopupMode">
-    </method>
-
-    <method name="setPulseAppVolumeControl">
-    </method>
-
-    <method name="getPulseAppVolumeControl">
-      <arg type="i" name="state" direction="out"/>
-    </method>
-
-    <method name="setSipPort">
-      <arg type="i" name="port" direction="in"/>
-    </method>
-
-    <method name="getSipPort">
-      <arg type="i" name="port" direction="out"/>
-    </method>
-
-    <method name="setStunServer">
-      <arg type="s" name="server" direction="in"/>
-    </method>
-
-    <method name="getStunServer">
-      <arg type="s" name="server" direction="out"/>
-    </method>
-
-    <method name="enableStun">
-    </method>
-
-    <method name="isStunEnabled">
-      <arg type="i" name="state" direction="out"/>
-    </method>
-
-    <!-- Addressbook configuration -->
-    <method name="getAddressbookSettings">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringInt"/>
-      <arg type="a{si}" name="settings" direction="out"/>
-    </method>
-
-    <method name="setAddressbookSettings">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringInt"/>
-      <arg type="a{si}" name="settings" direction="in"/>
-    </method>
-
-	<!-- Addressbook list -->
-    <method name="getAddressbookList">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
-      <arg type="as" name="settings" direction="out"/>
-    </method>
-
-    <method name="setAddressbookList">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="VectorString"/>
-      <arg type="as" name="settings" direction="in"/>
-    </method>
-
-    <!-- Hook configuration -->
-    <method name="getHookSettings">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
-      <arg type="a{ss}" name="settings" direction="out"/>
-    </method>
-
-    <method name="setHookSettings">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
-      <arg type="a{ss}" name="settings" direction="in"/>
-    </method>
-
-  <!--        /////////////////////////////       -->
-
-<!--
-    <signal name="parametersChanged">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
-      <arg type="a{ss}" name="details" direction="out"/>
-    </signal>
--->    
-
-    <signal name="accountsChanged">
-    </signal>
-
-    <signal name="errorAlert">
-      <arg type="i" name="code" direction="out"/>
-    </signal>
-
-  </interface>
-</node>
+	<interface name="org.sflphone.SFLphone.ConfigurationManager">
+		
+		<!-- Accounts-related methods -->  
+		<method name="getAccountDetails">
+			<arg type="s" name="accountID" direction="in"/>
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+			<arg type="a{ss}" name="details" direction="out"/>
+		</method>
+		
+		<method name="setAccountDetails">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="MapStringString"/>
+			<arg type="s" name="accountID" direction="in"/>
+			<arg type="a{ss}" name="details" direction="in"/>
+		</method>
+		
+		<method name="addAccount">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
+			<arg type="a{ss}" name="details" direction="in"/>
+			<arg type="s" name="createdAccountId" direction="out"/>
+		</method>
+		
+		<method name="setAccountsOrder">
+			<arg type="s" name="order" direction="in"/>
+		</method>
+		
+		<method name="removeAccount">
+			<arg type="s" name="accoundID" direction="in"/>
+		</method>
+		
+		<method name="getAccountList">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+			<arg type="as" name="list" direction="out"/>
+		</method>
+		
+		<method name="sendRegister">
+			<arg type="s" name="accountID" direction="in"/>
+			<arg type="i" name="expire" direction="in"/>
+		</method>
+		
+		<!--      ///////////////////////               -->
+		
+		<!-- Various audio-related methods   -->
+		
+		<method name="getToneLocaleList">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+			<arg type="as" name="list" direction="out"/>
+		</method>
+		
+		<method name="getVersion">
+			<arg type="s" name="version" direction="out"/>
+		</method>
+		
+		<method name="getRingtoneList">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+			<arg type="as" name="list" direction="out"/>
+		</method>
+		
+		<method name="getPlaybackDeviceList">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+			<arg type="as" name="list" direction="out"/>
+		</method>
+		
+		<method name="getRecordDeviceList">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+			<arg type="as" name="list" direction="out"/>
+		</method>
+		
+		<method name="isRingtoneEnabled">
+			<arg type="i" name="bool" direction="out"/>
+		</method>
+		
+		<method name="ringtoneEnabled">
+		</method>
+		
+		<method name="getRingtoneChoice">
+			<arg type="s" name="tone" direction="out"/>
+		</method>
+		
+		<method name="setRingtoneChoice">
+			<arg type="s" name="tone" direction="in"/>
+		</method>
+		
+		<method name="getAudioManager">
+			<arg type="i" name="api" direction="out"/>
+		</method>
+		
+		<method name="setAudioManager">
+			<arg type="i" name="api" direction="in"/>
+		</method>
+		
+		<method name="getRecordPath">
+			<arg type="s" name="rec" direction="out"/>
+		</method>
+		
+		<method name="setRecordPath">
+			<arg type="s" name="rec" direction="in"/>
+		</method>
+		
+		<!--      ///////////////////////               -->
+		
+		<!-- Codecs-related methods -->
+		
+		<method name="getCodecList">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+			<arg type="as" name="list" direction="out"/>
+		</method>
+		
+		<method name="getCodecDetails">
+			<arg type="i" name="payload" direction="in"/>
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+			<arg type="as" name="details" direction="out"/>
+		</method>
+		
+		<method name="getActiveCodecList">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+			<arg type="as" name="list" direction="out"/>
+		</method>
+		
+		<method name="setActiveCodecList">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="VectorString"/>
+			<arg type="as" name="list" direction="in"/>
+		</method>
+		
+		
+		<!-- Audio devices methods -->
+		
+		<method name="getInputAudioPluginList">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+			<arg type="as" name="list" direction="out"/>
+		</method>
+		
+		<method name="getOutputAudioPluginList">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+			<arg type="as" name="list" direction="out"/>
+		</method>
+		
+		<method name="setInputAudioPlugin">
+			<arg type="s" name="audioPlugin" direction="in"/>
+		</method>
+		
+		<method name="setOutputAudioPlugin">
+			<arg type="s" name="audioPlugin" direction="in"/>
+		</method>
+		
+		<method name="getAudioOutputDeviceList">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+			<arg type="as" name="list" direction="out"/>
+		</method>
+		
+		<method name="setAudioOutputDevice">
+			<arg type="i" name="index" direction="in"/>
+		</method>
+		
+		<method name="getAudioInputDeviceList">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+			<arg type="as" name="list" direction="out"/>
+		</method>
+		
+		<method name="setAudioInputDevice">
+			<arg type="i" name="index" direction="in"/>
+		</method>
+		
+		<method name="getCurrentAudioDevicesIndex">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+			<arg type="as" name="list" direction="out"/>
+		</method>
+		
+		<method name="getAudioDeviceIndex">
+			<arg type="s" name="name" direction="in"/>
+			<arg type="i" name="index" direction="out"/>
+		</method>
+		
+		<method name="getCurrentAudioOutputPlugin">
+			<arg type="s" name="plugin" direction="out"/>
+		</method>
+		
+		<!--    General Settings Panel         -->
+		
+		<method name="isIax2Enabled">
+			<arg type="i" name="res" direction="out"/>
+		</method>
+		
+		<method name="setNotify">
+		</method>
+		
+		<method name="getNotify">
+			<arg type="i" name="level" direction="out"/>
+		</method>
+		
+		<method name="setMailNotify">
+		</method>
+		
+		<method name="getMailNotify">
+			<arg type="i" name="level" direction="out"/>
+		</method>
+		
+		<method name="getDialpad">
+			<arg type="i" name="state" direction="out"/>
+		</method>
+		
+		<method name="setDialpad">
+		</method>
+		
+		<method name="getSearchbar">
+			<arg type="i" name="state" direction="out"/>
+		</method>
+		
+		<method name="setSearchbar">
+		</method>
+		
+		<method name="setHistoryEnabled">
+		</method>
+		
+		<method name="getHistoryEnabled">
+			<arg type="i" name="state" direction="out"/>
+		</method>
+		
+		<method name="getVolumeControls">
+			<arg type="i" name="state" direction="out"/>
+		</method>
+		
+		<method name="setVolumeControls">
+		</method>
+		
+		<method name="getHistoryLimit">
+			<arg type="i" name="days" direction="out"/>
+		</method>
+		
+		<method name="setHistoryLimit">
+			<arg type="i" name="days" direction="in"/>
+		</method>
+		
+		<method name="startHidden">
+		</method>
+		
+		<method name="isStartHidden">
+			<arg type="i" name="state" direction="out"/>
+		</method>
+		
+		<method name="popupMode">
+			<arg type="i" name="state" direction="out"/>
+		</method>
+		
+		<method name="switchPopupMode">
+		</method>
+		
+		<method name="setPulseAppVolumeControl">
+		</method>
+		
+		<method name="getPulseAppVolumeControl">
+			<arg type="i" name="state" direction="out"/>
+		</method>
+		
+		<method name="setSipPort">
+			<arg type="i" name="port" direction="in"/>
+		</method>
+		
+		<method name="getSipPort">
+			<arg type="i" name="port" direction="out"/>
+		</method>
+		
+		<method name="setStunServer">
+			<arg type="s" name="server" direction="in"/>
+		</method>
+		
+		<method name="getStunServer">
+			<arg type="s" name="server" direction="out"/>
+		</method>
+		
+		<method name="enableStun">
+		</method>
+		
+		<method name="isStunEnabled">
+			<arg type="i" name="state" direction="out"/>
+		</method>
+		
+		<!-- Addressbook configuration -->
+		<method name="getAddressbookSettings">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringInt"/>
+			<arg type="a{si}" name="settings" direction="out"/>
+		</method>
+		
+		<method name="setAddressbookSettings">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringInt"/>
+			<arg type="a{si}" name="settings" direction="in"/>
+		</method>
+		
+		<!-- Addressbook list -->
+		<method name="getAddressbookList">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+			<arg type="as" name="settings" direction="out"/>
+		</method>
+		
+		<method name="setAddressbookList">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="VectorString"/>
+			<arg type="as" name="settings" direction="in"/>
+		</method>
+		
+		<!-- Hook configuration -->
+		<method name="getHookSettings">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+			<arg type="a{ss}" name="settings" direction="out"/>
+		</method>
+		
+		<method name="setHookSettings">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
+			<arg type="a{ss}" name="settings" direction="in"/>
+		</method>
+		
+		<method name="getHistory">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+			<arg type="a{ss}" name="entries" direction="out"/>
+		</method>
+		
+		<method name="setHistory">
+			<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
+			<arg type="a{ss}" name="entries" direction="in"/>
+		</method>
+		
+		<!--        /////////////////////////////       -->
+		
+		<!--
+			 <signal name="parametersChanged">
+				 <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
+				 <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+				 <arg type="a{ss}" name="details" direction="out"/>
+			 </signal>
+			 -->    
+			 
+			 <signal name="accountsChanged">
+			 </signal>  
+			 
+			 <signal name="errorAlert">
+				 <arg type="i" name="code" direction="out"/>
+			 </signal>
+			 
+		 </interface>
+	 </node>
diff --git a/sflphone-client-kde/src/dbus/instance-introspec.xml b/sflphone-client-kde/src/dbus/instance-introspec.xml
index 90a60d632d04ca83039efcadcfa2f4981bfda39e..d211a0f483588ba8f9dcb620b6f6804963d6d41e 100644
--- a/sflphone-client-kde/src/dbus/instance-introspec.xml
+++ b/sflphone-client-kde/src/dbus/instance-introspec.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" ?>
 <node name="/org/sflphone/SFLphone">
-  <interface name="org.sflphone.SFLphone.Instance">
-  
-    <method name="Register">
-      <arg type="i" name="pid" direction="in"/>
-      <arg type="s" name="name" direction="in"/>
-    </method>
-    
-    <method name="Unregister">
-      <arg type="i" name="pid" direction="in"/>
-    </method>
-    
-    <method name="getRegistrationCount">
-      <arg type="i" name="count" direction="out"/>
-    </method>
-  </interface>
+	<interface name="org.sflphone.SFLphone.Instance">
+		
+		<method name="Register">
+			<arg type="i" name="pid" direction="in"/>
+			<arg type="s" name="name" direction="in"/>
+		</method>
+		
+		<method name="Unregister">
+			<arg type="i" name="pid" direction="in"/>
+		</method>
+		
+		<method name="getRegistrationCount">
+			<arg type="i" name="count" direction="out"/>
+		</method>
+	</interface>
 </node>
diff --git a/sflphone-client-kde/src/main.cpp b/sflphone-client-kde/src/main.cpp
index 76865ea15927284ce4d684a69cb088c1863bd9e1..e0cb4b3b1450f6a71ffcace74cf754d6822afc37 100644
--- a/sflphone-client-kde/src/main.cpp
+++ b/sflphone-client-kde/src/main.cpp
@@ -19,7 +19,7 @@
 #include "conf/ConfigurationDialog.h"
 
 
-static const char description[] = I18N_NOOP("A KDE 4 Client for SFLPhone");
+static const char description[] = I18N_NOOP("A KDE 4 Client for SFLphone");
 
 static const char version[] = "0.9.5";
 
@@ -35,16 +35,19 @@ int main(int argc, char **argv)
 		KAboutData about(
 		   "sflphone-client-kde", 
 		   0, 
-		   ki18n("SFLPhone KDE Client"), 
+		   ki18n("SFLphone KDE Client"), 
 		   version, 
 		   ki18n(description),
-		   KAboutData::License_GPL, 
+		   KAboutData::License_GPL_V3, 
 		   ki18n("(C) 2009 Savoir-faire Linux"), 
 		   KLocalizedString(), 
-		   0, 
-		   "jeremy.quentin@savoirfairelinux.com");
+		   "http://www.sflphone.org.", 
+		   "sflphone@lists.savoirfairelinux.net");
 		
 		about.addAuthor( ki18n("Jérémy Quentin"), KLocalizedString(), "jeremy.quentin@savoirfairelinux.com" );
+		about.setProgramIconName(ICON_SFLPHONE);
+		about.setTranslator( ki18nc("NAME OF TRANSLATORS","Your names"), ki18nc("EMAIL OF TRANSLATORS","Your emails") );
+		
 		KCmdLineArgs::init(argc, argv, &about);
 		KCmdLineOptions options;
 		//options.add("+[URL]", ki18n( "Document to open" ));
diff --git a/sflphone-client-kde/src/qrc/resources.qrc b/sflphone-client-kde/src/qrc/resources.qrc
index db22439d98b1410434876265ccd04a0a4f6ff8d0..f0410dc28014b0658f684e46dd28af1adac1f05a 100644
--- a/sflphone-client-kde/src/qrc/resources.qrc
+++ b/sflphone-client-kde/src/qrc/resources.qrc
@@ -1,6 +1,7 @@
 <RCC>
   <qresource prefix="images" >
     <file>../icons/sflphone.svg</file>
+    <file>../icons/sflphone-kde3.svg</file>
     <file>../icons/sflphone_notif.svg</file>
     <file>../icons/x-office-address-book.png</file>
     <file>../icons/add.png</file>
diff --git a/sflphone-client-kde/src/sflphone_const.h b/sflphone-client-kde/src/sflphone_const.h
index 9583eb776ba43e429125a82e15f6be25c7f234c5..9771be44158dd78337f519f97679c81184c1e9c5 100644
--- a/sflphone-client-kde/src/sflphone_const.h
+++ b/sflphone-client-kde/src/sflphone_const.h
@@ -160,6 +160,7 @@
 #define CALL_STATE_CHANGE_FAILURE         "FAILURE"
 #define CALL_STATE_CHANGE_UNHOLD_CURRENT  "UNHOLD_CURRENT"
 #define CALL_STATE_CHANGE_UNHOLD_RECORD   "UNHOLD_RECORD"
+#define CALL_STATE_CHANGE_UNKNOWN         "UNKNOWN"
 
 /** Address Book Settings */
 #define ADDRESSBOOK_MAX_RESULTS           "ADDRESSBOOK_MAX_RESULTS"
diff --git a/sflphone-client-kde/src/sflphone_kdeview.cpp b/sflphone-client-kde/src/sflphone_kdeview.cpp
index 221756b90598860f4c866282205b0e5cba7088fb..132d8378e56bed352ca7f44a6f5fae5879e02417 100644
--- a/sflphone-client-kde/src/sflphone_kdeview.cpp
+++ b/sflphone-client-kde/src/sflphone_kdeview.cpp
@@ -85,6 +85,8 @@ sflphone_kdeView::sflphone_kdeView(QWidget *parent)
 	
 	loadWindow();
 	
+	emit statusMessageChanged("youhou");
+	
 } 
 
 sflphone_kdeView::~sflphone_kdeView()
@@ -494,6 +496,7 @@ void sflphone_kdeView::updateWindowCallState()
 					enabledActions[3] = false;
 					break;
 				case CALL_STATE_CURRENT:
+					qDebug() << "Calling getCallDetails3";
 					qDebug() << "details = " << CallManagerInterfaceSingleton::getInstance().getCallDetails(call->getCallId()).value();
 					qDebug() << "Reached CALL_STATE_CURRENT with call " << (*callList)[item]->getCallId() << ". Updating window.";
 					recordEnabled = true;
@@ -1399,7 +1402,7 @@ void sflphone_kdeView::on1_incomingCall(const QString &accountID, const QString
 
 void sflphone_kdeView::on1_incomingMessage(const QString &accountID, const QString &message)
 {
-	qDebug() << "Signal : Incoming Message ! ";
+	qDebug() << "Signal : Incoming Message ! \nMessage : " << message;
 }
 
 void sflphone_kdeView::on1_voiceMailNotify(const QString &accountID, int count)
diff --git a/sflphone-client-kde/src/sflphone_kdeview.h b/sflphone-client-kde/src/sflphone_kdeview.h
index eb3f9651acd89bd83bbb4e67d8c32b3739cfd02d..9f2a182eaa7ae68833b1d520575713a7bb55f0a6 100644
--- a/sflphone-client-kde/src/sflphone_kdeview.h
+++ b/sflphone-client-kde/src/sflphone_kdeview.h
@@ -200,6 +200,8 @@ private slots:
 	void on1_voiceMailNotify(const QString &accountID, int count);
 	void on1_volumeChanged(const QString &device, double value);
 	
+signals:
+	void statusMessageChanged(QString message);
 
 };
 
diff --git a/sflphone-common/src/dbus/configurationmanager-introspec.xml b/sflphone-common/src/dbus/configurationmanager-introspec.xml
index 05e6d554c3aef376d5592d3c3eb99ed37b253d41..7e3888c2338960ea9c20d4d0d7e0fed94c09a4cf 100644
--- a/sflphone-common/src/dbus/configurationmanager-introspec.xml
+++ b/sflphone-common/src/dbus/configurationmanager-introspec.xml
@@ -310,7 +310,7 @@
     </method>
 
     <method name="getHistory">
-        <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
+        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
         <arg type="a{ss}" name="entries" direction="out"/>
     </method>
 
diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index e5f8a3a59ef0471d7b3036cd30877a8b8ca5f72a..681a61aa740568402eb6cd4fb2b7292e9b70c099 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -2861,7 +2861,7 @@ std::map< std::string, std::string > ManagerImpl::getCallDetails(const CallID& c
     AccountID accountid;
     Account *account;
     VoIPLink *link;
-    Call *call;
+    Call *call = NULL;
     std::stringstream type;
 
 
@@ -2875,17 +2875,13 @@ std::map< std::string, std::string > ManagerImpl::getCallDetails(const CallID& c
     // Then the VoIP link this account is linked with (IAX2 or SIP)
     if ( (account=getAccount (accountid)) != 0) {
         link = account->getVoIPLink ();
-
         if (link) {
             call = link->getCall (callID);
         }
-
     }
-
     if (call) 
     {
         type << call->getCallType () << std::endl;
-
         call_details.insert (std::pair<std::string, std::string> ("ACCOUNTID", accountid));
         call_details.insert (std::pair<std::string, std::string> ("PEER_NUMBER", call->getPeerNumber ()));
         call_details.insert (std::pair<std::string, std::string> ("PEER_NAME", call->getPeerName ()));
@@ -2898,10 +2894,9 @@ std::map< std::string, std::string > ManagerImpl::getCallDetails(const CallID& c
         call_details.insert (std::pair<std::string, std::string> ("ACCOUNTID", AccountNULL));
         call_details.insert (std::pair<std::string, std::string> ("PEER_NUMBER", "Unknown"));
         call_details.insert (std::pair<std::string, std::string> ("PEER_NAME", "Unknown"));
-        call_details.insert (std::pair<std::string, std::string> ("CALL_STATE", "FAILURE"));
+        call_details.insert (std::pair<std::string, std::string> ("CALL_STATE", "UNKNOWN"));
         call_details.insert (std::pair<std::string, std::string> ("CALL_TYPE", "0"));
     }
-
     return call_details;
 }
 
diff --git a/sflphone-common/src/voiplink.cpp b/sflphone-common/src/voiplink.cpp
index 77a0c95ed11f7cc05646e0baa21a311501310ab8..825edac881da94cfe3dbdb2c1b828cd5b56ea220 100644
--- a/sflphone-common/src/voiplink.cpp
+++ b/sflphone-common/src/voiplink.cpp
@@ -36,7 +36,7 @@ VoIPLink::~VoIPLink (void)
 bool VoIPLink::addCall(Call* call)
 {
     if (call) {
-        if (getCall(call->getCallId()) == 0) {
+        if (getCall(call->getCallId()) == NULL) {
             ost::MutexLock m(_callMapMutex);
             _callMap[call->getCallId()] = call;
         }
@@ -60,7 +60,7 @@ Call* VoIPLink::getCall(const CallID& id)
   if ( iter != _callMap.end() ) {
     return iter->second;
   }
-  return 0;
+  return NULL;
 }
 
 bool VoIPLink::clearCallMap()