diff --git a/sflphone-gtk/src/actions.c b/sflphone-gtk/src/actions.c
index 5e9cf8ef4..5d0cbce04 100644
--- a/sflphone-gtk/src/actions.c
+++ b/sflphone-gtk/src/actions.c
@@ -497,6 +497,8 @@ sflphone_keypad( guint keyval, gchar * key)
 			case CALL_STATE_DIALING: // Currently dialing => edit number
 				//dbus_play_dtmf(key);
 				process_dialing(c, keyval, key);
+				//if( active_calltree == history )
+				  //switch_tab();
 				break;
 			case CALL_STATE_CURRENT:
 				switch (keyval)
diff --git a/sflphone-gtk/src/timestamp.c b/sflphone-gtk/src/timestamp.c
index 91d50c4c4..e3b6e2c21 100644
--- a/sflphone-gtk/src/timestamp.c
+++ b/sflphone-gtk/src/timestamp.c
@@ -71,8 +71,16 @@ format( struct tm* ptr )
   gchar *hour, *min;
   gchar *day_of_week, *month, *day_number;
 
-  hour = g_markup_printf_escaped("%i", ptr->tm_hour);
-  min = g_markup_printf_escaped("%i", ptr->tm_min);
+  if( ptr->tm_hour < 10 )
+    hour = g_markup_printf_escaped("0%i", ptr->tm_hour);
+  else
+    hour = g_markup_printf_escaped("%i", ptr->tm_hour);
+  
+  if( ptr->tm_min < 10 )
+    min = g_markup_printf_escaped("0%i", ptr->tm_min);
+  else
+    min = g_markup_printf_escaped("%i", ptr->tm_min);
+
   day_of_week = g_markup_printf_escaped( "%i", ptr->tm_mday );
 
   month = months[ptr->tm_mon];