diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatContent.qml b/linphone-app/ui/modules/Linphone/Chat/ChatContent.qml
index c5adedb86..0d5445730 100644
--- a/linphone-app/ui/modules/Linphone/Chat/ChatContent.qml
+++ b/linphone-app/ui/modules/Linphone/Chat/ChatContent.qml
@@ -26,6 +26,7 @@ Column{
 	property string lastTextSelected
 	property alias textColor: message.color
 	property alias textFont: message.font
+	property alias fileIsHovering: fileMessage.isHovering
 	
 	signal rightClicked()
 	signal conferenceIcsCopied()
diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatFileMessage.qml b/linphone-app/ui/modules/Linphone/Chat/ChatFileMessage.qml
index a0f082499..a70225922 100644
--- a/linphone-app/ui/modules/Linphone/Chat/ChatFileMessage.qml
+++ b/linphone-app/ui/modules/Linphone/Chat/ChatFileMessage.qml
@@ -26,6 +26,7 @@ Row {
 	
 	property bool isAnimatedImage : mainRow.contentModel && mainRow.contentModel.wasDownloaded && UtilsCpp.isAnimatedImage(mainRow.contentModel.filePath)
 	property bool haveThumbnail: mainRow.contentModel && mainRow.contentModel.thumbnail
+	property bool isHovering: thumbnailProvider.state == 'hovered'
 	
 	signal copyAllDone()
 	signal copySelectionDone()
diff --git a/linphone-app/ui/modules/Linphone/Chat/Message.qml b/linphone-app/ui/modules/Linphone/Chat/Message.qml
index 94f00ea37..86ed51f9b 100644
--- a/linphone-app/ui/modules/Linphone/Chat/Message.qml
+++ b/linphone-app/ui/modules/Linphone/Chat/Message.qml
@@ -115,6 +115,7 @@ Item {
 						onLastTextSelectedChanged: container.lastTextSelected= lastTextSelected
 						onRightClicked: chatMenu.open()
 						onConferenceIcsCopied: container.conferenceIcsCopied()
+						onFileIsHoveringChanged: menuButton.visible = !fileIsHovering
 						Rectangle{
 							anchors.left: parent.left
 							anchors.right: parent.right
@@ -177,6 +178,7 @@ Item {
 	}
 	
 	ActionButton {
+		id: menuButton
 		anchors.left:rectangle.right
 		anchors.leftMargin: -10
 		anchors.top:rectangle.top