diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp
index de415fccd..8c2fd3fb0 100644
--- a/src/widget/form/genericchatform.cpp
+++ b/src/widget/form/genericchatform.cpp
@@ -212,12 +212,15 @@ ChatMessage::Ptr GenericChatForm::addMessage(const ToxID& author, const QString
     if(isAction)
     {
         msg = ChatMessage::createChatMessage(authorStr, message, true, false, false);
+        previousId.clear();
     }
     else
     {
         msg = ChatMessage::createChatMessage(authorStr, message, false, false, author.isMine());
         if(author == previousId)
             msg->hideSender();
+
+        previousId = author;
     }
 
     insertChatMessage(msg);
@@ -225,8 +228,6 @@ ChatMessage::Ptr GenericChatForm::addMessage(const ToxID& author, const QString
     if(isSent)
         msg->markAsSent(datetime);
 
-    previousId = author;
-
     return msg;
 }