diff --git a/src/syng_im/handlers.cljs b/src/syng_im/handlers.cljs
index 519b62f566..fda44dfc3b 100644
--- a/src/syng_im/handlers.cljs
+++ b/src/syng_im/handlers.cljs
@@ -148,7 +148,7 @@
 (defn joined-chat-msg [chat-id from msg-id]
   (let [contact-name (:name (contacts/contact-by-identity from))]
     (save-message chat-id {:from         "system"
-                           :msg-id       msg-id
+                           :msg-id       (str msg-id "_" from)
                            :content      (str (or contact-name from) " received chat invitation")
                            :content-type text-content-type})))