diff --git a/src/libclient/conversationmodel.cpp b/src/libclient/conversationmodel.cpp
index bdb79cce..7dac144b 100644
--- a/src/libclient/conversationmodel.cpp
+++ b/src/libclient/conversationmodel.cpp
@@ -1507,7 +1507,7 @@ ConversationModel::clearInteractionFromConversation(const QString& convId,
                 lastInteractionUpdated = true;
             }
             if (conversation.lastSelfMessageId == interactionId) {
-                conversation.lastSelfMessageId = conversation.interactions->lastSelfMessageId();
+                conversation.lastSelfMessageId = conversation.interactions->lastSelfMessageId(owner.profileInfo.uri);
             }
 
         } catch (const std::out_of_range& e) {
@@ -2488,7 +2488,8 @@ ConversationModelPimpl::slotConversationLoaded(uint32_t requestId,
         }
 
         conversation.lastMessageUid = conversation.interactions->lastMessageUid();
-        conversation.lastSelfMessageId = conversation.interactions->lastSelfMessageId();
+        conversation.lastSelfMessageId = conversation.interactions->lastSelfMessageId(
+            linked.owner.profileInfo.uri);
         if (conversation.lastMessageUid.isEmpty() && !conversation.allMessagesLoaded
             && messages.size() != 0) {
             if (conversation.interactions->size() > 0) {
@@ -2657,7 +2658,8 @@ ConversationModelPimpl::slotMessageReceived(const QString& accountId,
             return;
         }
         conversation.lastMessageUid = conversation.interactions->lastMessageUid();
-        conversation.lastSelfMessageId = conversation.interactions->lastSelfMessageId();
+        conversation.lastSelfMessageId = conversation.interactions->lastSelfMessageId(
+            linked.owner.profileInfo.uri);
         invalidateModel();
         if (!interaction::isOutgoing(msg)) {
             Q_EMIT behaviorController.newUnreadInteraction(linked.owner.id,
diff --git a/src/libclient/messagelistmodel.cpp b/src/libclient/messagelistmodel.cpp
index b657ceaa..614153bc 100644
--- a/src/libclient/messagelistmodel.cpp
+++ b/src/libclient/messagelistmodel.cpp
@@ -722,12 +722,12 @@ MessageListModel::lastMessageUid() const
 }
 
 QString
-MessageListModel::lastSelfMessageId() const
+MessageListModel::lastSelfMessageId(const QString& id) const
 {
     for (auto it = interactions_.rbegin(); it != interactions_.rend(); ++it) {
         auto lastType = it->second.type;
         if (lastType == interaction::Type::TEXT and !it->second.body.isEmpty()
-            and it->second.authorUri.isEmpty()) {
+            and (it->second.authorUri.isEmpty() || it->second.authorUri == id)) {
             return it->first;
         }
     }
diff --git a/src/libclient/messagelistmodel.h b/src/libclient/messagelistmodel.h
index 2a86affd..a32a756c 100644
--- a/src/libclient/messagelistmodel.h
+++ b/src/libclient/messagelistmodel.h
@@ -142,7 +142,7 @@ public:
     void reactToMessage(const QString& msgId, interaction::Info& info);
     QVariantMap convertReactMessagetoQVariant(const QSet<QString>&);
     QString lastMessageUid() const;
-    QString lastSelfMessageId() const;
+    QString lastSelfMessageId(const QString& id) const;
 
     QString findEmojiReaction(const QString& emoji,
                               const QString& authorURI,
diff --git a/src/libclient/qtwrapper/videomanager_wrap.h b/src/libclient/qtwrapper/videomanager_wrap.h
index 1c94126a..24402596 100644
--- a/src/libclient/qtwrapper/videomanager_wrap.h
+++ b/src/libclient/qtwrapper/videomanager_wrap.h
@@ -126,14 +126,14 @@ public Q_SLOTS: // METHODS
     QString openVideoInput(const QString& resource)
     {
 #ifdef ENABLE_VIDEO
-        return libjami::openVideoInput(resource.toStdString()).c_str();
+        return libjami::openVideoInput(resource.toLatin1().toStdString()).c_str();
 #endif
     }
 
     void closeVideoInput(const QString& resource)
     {
 #ifdef ENABLE_VIDEO
-        libjami::closeVideoInput(resource.toStdString());
+        libjami::closeVideoInput(resource.toLatin1().toStdString());
 #endif
     }