diff --git a/CHANGELOG.md b/CHANGELOG.md
index b448176ff..542ebe407 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,13 +11,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - File viewer in chats (Image/Animated Image/Video/Texts) with the option to export the file.
 - Accept/decline CLI commands.
 
-## 5.0.16 - undefined
+## 5.0.16 - 2023-05-12
 
 ### Fixed
 - Section date timezone in chat.
 - Use custom font for chat compose area.
 - Calling conference from history.
 - Speaking border display.
+- Replace double click on avatar by a simple click for copying address into the SmartSearchBar.
 - Update SDK to 5.2.60 (Active Speaker fix)
 
 ## 5.0.15 - 2023-04-11
diff --git a/linphone-app/ui/modules/Common/Tooltip/TooltipArea.qml b/linphone-app/ui/modules/Common/Tooltip/TooltipArea.qml
index 70770ceeb..72e9a4f14 100644
--- a/linphone-app/ui/modules/Common/Tooltip/TooltipArea.qml
+++ b/linphone-app/ui/modules/Common/Tooltip/TooltipArea.qml
@@ -11,6 +11,7 @@ MouseArea {
 	property alias text: tooltip.text
 	property int delay: TooltipStyle.delay
 	property bool force: false
+	property bool hide: false
 	property var tooltipParent: parent
 	property int maxWidth : window? window.width : tooltipParent.width
 	
@@ -33,7 +34,7 @@ MouseArea {
 	hoverEnabled: true
 	scrollGestureEnabled: true
 	
-	onContainsMouseChanged: _visible = containsMouse
+	onContainsMouseChanged: _visible = !hide && containsMouse
 	cursorShape: containsMouse ? hoveringCursor : Qt.ArrowCursor
 	
 	onPressed: {
diff --git a/linphone-app/ui/modules/Linphone/Chat/IncomingMessage.qml b/linphone-app/ui/modules/Linphone/Chat/IncomingMessage.qml
index f5dc028bc..bbf856958 100644
--- a/linphone-app/ui/modules/Linphone/Chat/IncomingMessage.qml
+++ b/linphone-app/ui/modules/Linphone/Chat/IncomingMessage.qml
@@ -52,9 +52,9 @@ RowLayout {
 			TooltipArea{
 				delay:0
 				text:avatar.username+'\n'+$chatEntry.fromSipAddress
-				tooltipParent:mainRow
+				maxWidth: mainRow.width
 				isClickable: true
-				onDoubleClicked: {
+				onClicked: {
 					window.mainSearchBar.text = $chatEntry.fromSipAddress
 					}
 			}