diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index cbd1bfb95f28fd0b7e2bd1edd78f607ae4c71417..638650dd0ed6c549a61265119b7189de9aa9a21b 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -1278,7 +1278,7 @@ void sflphone_save_history (void)
    void
 sflphone_srtp_on( callable_obj_t * c)
 {
-    c->_srtp_state = SRTP_STATE_SAS_UNCONFIRMED;
+    c->_srtp_state = SRTP_STATE_ZRTP_SAS_UNCONFIRMED;
 
     calltree_update_call(current_calls, c, NULL);
     update_actions();
@@ -1300,9 +1300,9 @@ sflphone_srtp_show_sas( callable_obj_t * c, const gchar* sas, const gboolean ver
     }
     c->_sas = g_strdup(sas);
     if(verified == TRUE) {
-        c->_srtp_state = SRTP_STATE_SAS_CONFIRMED;
+        c->_srtp_state = SRTP_STATE_ZRTP_SAS_CONFIRMED;
     } else {
-        c->_srtp_state = SRTP_STATE_SAS_UNCONFIRMED;
+        c->_srtp_state = SRTP_STATE_ZRTP_SAS_UNCONFIRMED;
     }
     calltree_update_call(current_calls, c, NULL);
     update_actions();
diff --git a/sflphone-client-gnome/src/callable_obj.h b/sflphone-client-gnome/src/callable_obj.h
index 21311d8da72c9b81402a58b637883d13a421ffc6..269746867bfc51cd5b71c0d4367586aa38837ca4 100644
--- a/sflphone-client-gnome/src/callable_obj.h
+++ b/sflphone-client-gnome/src/callable_obj.h
@@ -79,9 +79,9 @@ typedef enum
 typedef enum
 {
    SRTP_STATE_UNLOCKED = 0,
-   SRTP_STATE_SAS_CONFIRMED,
-   SRTP_STATE_SAS_UNCONFIRMED,
-   SRTP_STATE_SAS_SIGNED,
+   SRTP_STATE_ZRTP_SAS_CONFIRMED,
+   SRTP_STATE_ZRTP_SAS_UNCONFIRMED,
+   SRTP_STATE_ZRTP_SAS_SIGNED,
 } srtp_state_t;
 
 /** @struct callable_obj_t
@@ -135,8 +135,8 @@ typedef struct  {
      */
     GPtrArray * _error_dialogs;
 
-	/* The audio codec used for this call, if applicable */
-	gchar *_audio_codec;
+    /* The audio codec used for this call, if applicable */
+    gchar *_audio_codec;
 
 } callable_obj_t;
 
diff --git a/sflphone-client-gnome/src/contacts/calltree.c b/sflphone-client-gnome/src/contacts/calltree.c
index 536d97a039e76bc75c415ec6480258387196290e..fec54bcf59119951dc1ef36c8174f6cd85a4e5f0 100644
--- a/sflphone-client-gnome/src/contacts/calltree.c
+++ b/sflphone-client-gnome/src/contacts/calltree.c
@@ -285,16 +285,16 @@ row_single_click(GtkTreeView *tree_view UNUSED, void * data UNUSED)
 
 	  switch(selectedCall->_srtp_state) {
 
-	  case SRTP_STATE_SAS_UNCONFIRMED:
-	      selectedCall->_srtp_state = SRTP_STATE_SAS_CONFIRMED;
+	  case SRTP_STATE_ZRTP_SAS_UNCONFIRMED:
+	      selectedCall->_srtp_state = SRTP_STATE_ZRTP_SAS_CONFIRMED;
 	      if(g_strcasecmp(displaySasOnce,"true") == 0) {
 		  selectedCall->_zrtp_confirmed = TRUE;
 	      }
 	      dbus_confirm_sas(selectedCall);
 	      calltree_update_call(current_calls, selectedCall, NULL);
 	      break;
-	  case SRTP_STATE_SAS_CONFIRMED:
-	      selectedCall->_srtp_state = SRTP_STATE_SAS_UNCONFIRMED;
+	  case SRTP_STATE_ZRTP_SAS_CONFIRMED:
+	      selectedCall->_srtp_state = SRTP_STATE_ZRTP_SAS_UNCONFIRMED;
 	      dbus_reset_sas(selectedCall);
 	      calltree_update_call(current_calls, selectedCall, NULL);
 	      break;
@@ -590,7 +590,7 @@ calltree_create (calltab_t* tab, gboolean searchbar_type)
 			G_CALLBACK (focus_on_calltree_out), NULL);
 
 
-	if(tab != history || tab!=contacts) {
+	if(tab != history && tab!=contacts) {
 
 		DEBUG("SET TREE VIEW REORDABLE");
 		// Make calltree reordable for drag n drop
@@ -761,7 +761,7 @@ calltree_update_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
 	    }
 	    else {
 
-	        if((c->_sas != NULL) && (display_sas == TRUE) && (c->_srtp_state == SRTP_STATE_SAS_UNCONFIRMED) && (c->_zrtp_confirmed == FALSE)) {
+	        if((c->_sas != NULL) && (display_sas == TRUE) && (c->_srtp_state == SRTP_STATE_ZRTP_SAS_UNCONFIRMED) && (c->_zrtp_confirmed == FALSE)) {
 
 		    calltree_display_call_info(c, DISPLAY_TYPE_SAS, NULL, &description);
 				  
@@ -805,16 +805,16 @@ calltree_update_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
 		}        
 
 		switch(c->_srtp_state) {
-		case SRTP_STATE_SAS_UNCONFIRMED:
+		case SRTP_STATE_ZRTP_SAS_UNCONFIRMED:
 	            DEBUG("Secure is ON");
 		    pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_unconfirmed.svg", NULL);
 		    if(c->_sas != NULL) { DEBUG("SAS is ready with value %s", c->_sas); }
 		    break;
-		case SRTP_STATE_SAS_CONFIRMED:
+		case SRTP_STATE_ZRTP_SAS_CONFIRMED:
 		    DEBUG("SAS is confirmed");
 		    pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_confirmed.svg", NULL);   
 		    break;
-		case SRTP_STATE_SAS_SIGNED:   
+		case SRTP_STATE_ZRTP_SAS_SIGNED:   
 		    DEBUG("Secure is ON with SAS signed and verified");
 		    pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_certified.svg", NULL);
 		    break;
@@ -911,6 +911,8 @@ void calltree_add_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
 		}
 	} 
 
+	DEBUG("Added call key exchange is %s", key_exchange)
+
 	if( tab == current_calls )
 	{
 		switch(c->_state)