diff --git a/src/app/commoncomponents/DataTransferMessageDelegate.qml b/src/app/commoncomponents/DataTransferMessageDelegate.qml
index d8fad1738378a38d220556fb1221a8edf8bd446a..d91203f1036aa12d3249d305a3b7b6ef428d008f 100644
--- a/src/app/commoncomponents/DataTransferMessageDelegate.qml
+++ b/src/app/commoncomponents/DataTransferMessageDelegate.qml
@@ -202,7 +202,7 @@ Loader {
                                     dataTransferItem.hoveredLink = canOpen ?
                                                 ("file:///" + Body) : ""
                                     if (dataTransferItem.hoveredLink)
-                                        Qt.openUrlExternally(dataTransferItem.hoveredLink)
+                                        Qt.openUrlExternally(new Url(dataTransferItem.hoveredLink))
                                 }
                             }
                         }
diff --git a/src/app/commoncomponents/ReplyToRow.qml b/src/app/commoncomponents/ReplyToRow.qml
index 57d6833f93538c0ca9d4a0039f7297bf1ce678c0..7ec52fcc1af6bf674100d6ecfcee535519e6d4d6 100644
--- a/src/app/commoncomponents/ReplyToRow.qml
+++ b/src/app/commoncomponents/ReplyToRow.qml
@@ -86,6 +86,7 @@ Item {
 
                 text: ReplyToBody
                 elide: Text.ElideRight
+                textFormat: Text.MarkdownText
 
                 color:  UtilsAdapter.luma(bubble.color) ?
                     JamiTheme.chatviewTextColorLight :
diff --git a/src/app/commoncomponents/TextMessageDelegate.qml b/src/app/commoncomponents/TextMessageDelegate.qml
index 03ea535419669e9e800da29710bb2044089873bd..05feb3388aceae53fe11ad873218a7e89516a0ed 100644
--- a/src/app/commoncomponents/TextMessageDelegate.qml
+++ b/src/app/commoncomponents/TextMessageDelegate.qml
@@ -83,7 +83,7 @@ SBSMessageBase {
             renderType: Text.NativeRendering
             textFormat: Text.MarkdownText
             onLinkHovered: root.hoveredLink = hoveredLink
-            onLinkActivated: Qt.openUrlExternally(hoveredLink)
+            onLinkActivated: Qt.openUrlExternally(new URL(hoveredLink))
             readOnly: true
             color: getBaseColor()
 
diff --git a/src/app/mainview/components/AboutPopUp.qml b/src/app/mainview/components/AboutPopUp.qml
index 722008ae7cc7a31f9b5aab789259e164a24db1b0..57ca323a530fe954dc5605bb4f26c75f1a90aaff 100644
--- a/src/app/mainview/components/AboutPopUp.qml
+++ b/src/app/mainview/components/AboutPopUp.qml
@@ -155,7 +155,7 @@ BaseModalDialog {
                 textFormat: TextEdit.RichText
                 selectByMouse: true
                 readOnly: true
-                onLinkActivated: Qt.openUrlExternally(link)
+                onLinkActivated: Qt.openUrlExternally(new Url(link))
 
                 TextMetrics {
                     id: textMetricsjamiDeclarationHyperText
@@ -189,7 +189,7 @@ BaseModalDialog {
                 textFormat: TextEdit.RichText
                 selectByMouse: true
                 readOnly: true
-                onLinkActivated: Qt.openUrlExternally(link)
+                onLinkActivated: Qt.openUrlExternally(new Url(link))
 
                 TextMetrics {
                     id: textMetricsjamiNoneWarrantyHyperText
diff --git a/src/app/mainview/components/EditContainer.qml b/src/app/mainview/components/EditContainer.qml
index 5f13609878a91297d9e91afa20b4cb95225de4c7..e1aa3d6fe3f15b6e1f38c6b352b17c5b5f9e52bc 100644
--- a/src/app/mainview/components/EditContainer.qml
+++ b/src/app/mainview/components/EditContainer.qml
@@ -70,6 +70,7 @@ Rectangle {
                 }
 
                 text: metrics.elidedText
+                textFormat: Text.MarkdownText
                 color:  UtilsAdapter.luma(root.color) ?
                             JamiTheme.chatviewTextColorLight :
                             JamiTheme.chatviewTextColorDark
diff --git a/src/app/mainview/components/FilePreview.qml b/src/app/mainview/components/FilePreview.qml
index fe8f3fd94599a414882e39ee82e9830ada75ce56..30da38d8dc6eae9f8926e8fb937e1ad91a29dfff 100644
--- a/src/app/mainview/components/FilePreview.qml
+++ b/src/app/mainview/components/FilePreview.qml
@@ -92,7 +92,7 @@ Component {
                                     ctxMenu.y = mouse.y
                                     ctxMenu.openMenu()
                                 } else {
-                                    Qt.openUrlExternally("file://" + Body)
+                                    Qt.openUrlExternally(new Url("file://" + Body))
                                 }
                             }
                         }
diff --git a/src/app/messagesadapter.cpp b/src/app/messagesadapter.cpp
index b61ad0719a98c092062bc3956073ff0823485bb0..598c4109a8ea3cbeadb3ba582e34b95621dcaa85 100644
--- a/src/app/messagesadapter.cpp
+++ b/src/app/messagesadapter.cpp
@@ -180,6 +180,7 @@ MessagesAdapter::editMessage(const QString& convId, const QString& newBody, cons
         if (editId.isEmpty()) {
             return;
         }
+        set_editId("");
         lrcInstance_->getCurrentConversationModel()->editMessage(convId, newBody, editId);
     } catch (...) {
         qDebug() << "Exception during message edition:" << messageId;
diff --git a/src/app/settingsview/components/LogsView.qml b/src/app/settingsview/components/LogsView.qml
index 2073f9212eafe5c0b07ba5d05207dce095e77d5a..9afd5de759f0e23876c4a728998f74cf0a52c20f 100644
--- a/src/app/settingsview/components/LogsView.qml
+++ b/src/app/settingsview/components/LogsView.qml
@@ -220,7 +220,7 @@ Window {
                     autoAccelerator: true
 
                     onClicked: Qt.openUrlExternally(
-                                   "https://jami.net/bugs-and-improvements/")
+                                   new Url("https://jami.net/bugs-and-improvements/"))
                 }
             }
         }