diff --git a/linphone-app/ui/modules/Linphone/Dialog/SipAddressDialog.qml b/linphone-app/ui/modules/Linphone/Dialog/SipAddressDialog.qml
index 414941252..523468d32 100644
--- a/linphone-app/ui/modules/Linphone/Dialog/SipAddressDialog.qml
+++ b/linphone-app/ui/modules/Linphone/Dialog/SipAddressDialog.qml
@@ -58,13 +58,15 @@ DialogPlus {
 						return UtilsCpp.hasCapability(entry.sipAddress,  LinphoneEnums.FriendCapabilityLimeX3Dh)
 					},
 					handler: function (entry) {
+						console.log("Call selected: " +entry + "/"+entry.sipAddress)
 						mainItem.addressSelectedCallback(entry.sipAddress)
 						exit(1)
 					},
 				}]
 			
 			onEntryClicked: {
-					mainItem.addressSelectedCallback(sipAddress)
+					console.log("Call selected: " +entry + "/"+entry.sipAddress)
+					mainItem.addressSelectedCallback(entry.sipAddress)
 					exit(1)
 			}
 		}
diff --git a/linphone-app/ui/modules/Linphone/History/Event.qml b/linphone-app/ui/modules/Linphone/History/Event.qml
index 7f2780f05..068bc0752 100644
--- a/linphone-app/ui/modules/Linphone/History/Event.qml
+++ b/linphone-app/ui/modules/Linphone/History/Event.qml
@@ -12,7 +12,7 @@ import UtilsCpp 1.0
 
 Row {
 	id: mainItem
-	signal entryClicked(string sipAddress)
+	signal entryClicked(var entry)
 	
 	readonly property var _sipAddressObserver: SipAddressesModel.getSipAddressObserver($historyEntry.sipAddress, '')
 	property QtObject iconData
@@ -170,7 +170,7 @@ Row {
 		verticalAlignment: Text.AlignVCenter
 		MouseArea{
 			anchors.fill:parent
-			onClicked:entryClicked($historyEntry.sipAddress)
+			onClicked:entryClicked($historyEntry)
 		}
 	}
 	ActionButton {
diff --git a/linphone-app/ui/modules/Linphone/History/History.qml b/linphone-app/ui/modules/Linphone/History/History.qml
index 2b690f9d8..bdb9b6402 100644
--- a/linphone-app/ui/modules/Linphone/History/History.qml
+++ b/linphone-app/ui/modules/Linphone/History/History.qml
@@ -14,7 +14,7 @@ Rectangle {
   id: container
 
   property alias proxyModel: history.model
-  signal entryClicked(string sipAddress)
+  signal entryClicked(var entry)
 
   // ---------------------------------------------------------------------------
 
@@ -183,7 +183,7 @@ Rectangle {
             }
              Connections{
                 target:entryLoader.item
-                onEntryClicked:{entryClicked(sipAddress)}
+                onEntryClicked:{entryClicked(entry)}
               }
           }
         }
diff --git a/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml b/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml
index c44709839..5c1ce2081 100644
--- a/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml
+++ b/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml
@@ -205,6 +205,8 @@ ScrollableListView {
 
 	delegate: Rectangle {
 		id: sipAddressEntry
+		
+		property var entry: modelData
 
 		color: SipAddressesViewStyle.entry.color.normal
 		height: SipAddressesViewStyle.entry.height
@@ -245,7 +247,7 @@ ScrollableListView {
 
 					MouseArea {
 						anchors.fill: parent
-						onClicked: sipAddressesView.entryClicked(modelData.sipAddress, index)
+						onClicked: sipAddressesView.entryClicked(modelData, index)
 					}
 				}
 
@@ -284,11 +286,11 @@ ScrollableListView {
 							tooltipText:modelData.tooltipText?modelData.tooltipText:''
 							visible: sipAddressesView.actions[index].visible
 							onClicked: {
-								sipAddressesView.actions[index].handler(modelData)
+								sipAddressesView.actions[index].handler(sipAddressEntry.entry)
 							}
 							Icon{
 								visible: modelData.secure>0 && 
-									(sipAddressesView.actions[index].secureIconVisibleHandler ? sipAddressesView.actions[index].secureIconVisibleHandler(modelData) : true)
+									(sipAddressesView.actions[index].secureIconVisibleHandler ? sipAddressesView.actions[index].secureIconVisibleHandler(sipAddressEntry.entry) : true)
 								icon: 'secure_on'
 								iconSize:15
 								anchors.right:parent.right
diff --git a/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml b/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml
index ce334f430..10765b3b9 100644
--- a/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml
+++ b/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml
@@ -97,7 +97,7 @@ DialogPlus {
 							id: sipAddressesModel
 						}
 						
-						onEntryClicked: actions[0].handlerSipAddress(entry)
+						onEntryClicked: actions[0].handlerSipAddress(entry.sipAddress)
 					}
 				}
 			}
diff --git a/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml b/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml
index c9c912813..83d89a6ff 100644
--- a/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml
+++ b/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml
@@ -107,7 +107,7 @@ DialogPlus {
 							id: sipAddressesModel
 						}
 						
-						onEntryClicked: actions[0].handlerSipAddress(entry)
+						onEntryClicked: actions[0].handlerSipAddress(entry.sipAddress)
 					}
 				}
 			}
diff --git a/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml b/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml
index 798ac2b04..dd1b603b7 100644
--- a/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml
+++ b/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml
@@ -115,7 +115,7 @@ DialogPlus {
               id: conferenceHelperModel
             }
 
-            onEntryClicked: actions[0].handerSipAddress(entry)
+            onEntryClicked: actions[0].handerSipAddress(entry.sipAddress)
           }
         }
       }
diff --git a/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml b/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml
index ba2f81ad6..d2c50c82e 100644
--- a/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml
+++ b/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml
@@ -98,7 +98,7 @@ DialogPlus {
 				}]
 			
 			onEntryClicked: {
-				selectedParticipants.addAddress(entry)
+				selectedParticipants.addAddress(entry.sipAddress)
 			}
 		}
 		
diff --git a/linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml b/linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml
index a202038b7..c43922e57 100644
--- a/linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml
+++ b/linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml
@@ -328,8 +328,8 @@ DialogPlus {
 							}]
 						
 						onEntryClicked: {
-								selectedParticipants.addAddress(entry)
-								smartSearchBar.addAddressToIgnore(entry);
+								selectedParticipants.addAddress(entry.sipAddress)
+								smartSearchBar.addAddressToIgnore(entry.sipAddress);
 								++lastContacts.reloadCount
 						}
 					}
diff --git a/linphone-app/ui/views/App/Main/HistoryView.qml b/linphone-app/ui/views/App/Main/HistoryView.qml
index 509e375e3..fd44da1fb 100644
--- a/linphone-app/ui/views/App/Main/HistoryView.qml
+++ b/linphone-app/ui/views/App/Main/HistoryView.qml
@@ -159,8 +159,8 @@ ColumnLayout  {
 		Layout.fillWidth: true
 		
 		onEntryClicked:{
-			historyView.fullPeerAddress=sipAddress
-			historyView.peerAddress=sipAddress
+			historyView.fullPeerAddress=entry.sipAddress
+			historyView.peerAddress=entry.sipAddress
 			historyProxyModel.resetMessageCount()
 		}
 		
diff --git a/linphone-app/ui/views/App/Main/MainWindow.qml b/linphone-app/ui/views/App/Main/MainWindow.qml
index 2e8d774ed..b43c90401 100644
--- a/linphone-app/ui/views/App/Main/MainWindow.qml
+++ b/linphone-app/ui/views/App/Main/MainWindow.qml
@@ -186,9 +186,9 @@ ApplicationWindow {
 						
 						onEntryClicked: {
 							if (SettingsModel.contactsEnabled) {
-								window.setView('ContactEdit', { sipAddress: entry })
+								window.setView('ContactEdit', { sipAddress: entry.sipAddress })
 							} else {
-								CallsListModel.createChatRoom( '', false, [entry], true )
+								CallsListModel.createChatRoom( '', false, [entry.sipAddress], true )
 							}
 						}