diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index b6a79e3172c73a6dc58e4f7dd6c9014a1f38d69a..62457c518ba4016ab99d59e7f45f8e3f85ef154b 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -257,6 +257,7 @@ sflphone_hung_up (callable_obj_t * c)
 #if GTK_CHECK_VERSION(2,10,0)
     status_tray_icon_blink (FALSE);
 #endif
+    stop_call_clock(c);
     calltree_update_clock();
 }
 
diff --git a/sflphone-client-gnome/src/callable_obj.c b/sflphone-client-gnome/src/callable_obj.c
index e2c78e464f06b3c92a05e641f1b1fac128e22e87..da5326e665b45e05f8f6b8615cc78d1f5ee5c81c 100644
--- a/sflphone-client-gnome/src/callable_obj.c
+++ b/sflphone-client-gnome/src/callable_obj.c
@@ -39,18 +39,6 @@
 #define UNIX_DAY			86400
 #define UNIX_WEEK			86400 * 6
 #define UNIX_TWO_DAYS		        86400 * 2
-/*
-gint is_callID_callstruct (gconstpointer a, gconstpointer b)
-{
-   callable_obj_t * c = (callable_obj_t*) a;
-
-    if (g_strcasecmp (c->_callID, (const gchar*) b) == 0) {
-        return 0;
-    } else {
-        return 1;
-    }
-}
-*/
 
 gint get_state_callstruct (gconstpointer a, gconstpointer b)
 {
@@ -183,7 +171,6 @@ void threaded_clock_incrementer (void *pc)
 
 
         usleep (1000000);
-
     }
 
     DEBUG ("CallableObj: Stopping Thread");
diff --git a/sflphone-client-gnome/src/uimanager.c b/sflphone-client-gnome/src/uimanager.c
index 7c8f9c3a39131553631091f13f2645960ae296f6..afb9e8301645ed0838d061e0660bd9989937a4e9 100644
--- a/sflphone-client-gnome/src/uimanager.c
+++ b/sflphone-client-gnome/src/uimanager.c
@@ -263,7 +263,7 @@ update_actions()
                                     1);
                 break;
             case CALL_STATE_DIALING:
-		DEBUG("UIManager: Call State Dialing");
+                DEBUG("UIManager: Call State Dialing");
                 gtk_action_set_sensitive (GTK_ACTION (pickUpAction), TRUE);
 
                 if (active_calltree == current_calls)
@@ -275,16 +275,14 @@ update_actions()
 
                 if (active_calltree == current_calls)
                     gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget), 1);
-		else if(active_calltree == history) {
-		    if(selectedCall->_recordfile && (g_strcmp0(selectedCall->_recordfile, "") != 0)) {
-			if(selectedCall->_record_is_playing) {
-			    gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM(stopRecordWidget), 3);
-			}
-			else {
-		            gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM(playRecordWidget), 3);
-			}
-		    }
-		}
+                else if (active_calltree == history) {
+                    if (selectedCall->_recordfile && (g_strcmp0(selectedCall->_recordfile, "") != 0)) {
+                        if (selectedCall->_record_is_playing)
+                            gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM(stopRecordWidget), 3);
+                        else
+                            gtk_toolbar_insert(GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM(playRecordWidget), 3);
+                    }
+                }
                 break;
             case CALL_STATE_CURRENT:
                 DEBUG ("UIManager: Call State Current");