diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp
index ec86c0304..7607f8ad6 100644
--- a/src/widget/form/genericchatform.cpp
+++ b/src/widget/form/genericchatform.cpp
@@ -254,7 +254,7 @@ QDate GenericChatForm::getLatestDate() const
 void GenericChatForm::setName(const QString &newName)
 {
     nameLabel->setText(newName);
-    nameLabel->setToolTip(newName); // for overlength names
+    nameLabel->setToolTip(newName.toHtmlEscaped()); // for overlength names
 }
 
 void GenericChatForm::show(ContentLayout* contentLayout)
@@ -294,17 +294,18 @@ void GenericChatForm::onChatContextMenuRequested(QPoint pos)
 ChatMessage::Ptr GenericChatForm::addMessage(const ToxId& author, const QString &message, bool isAction,
                                              const QDateTime &datetime, bool isSent)
 {
-    QString authorStr = author.isActiveProfile() ? Core::getInstance()->getUsername() : resolveToxId(author);
+    bool authorIsActiveProfile = author.isActiveProfile();
+    QString authorStr = authorIsActiveProfile ? Core::getInstance()->getUsername() : resolveToxId(author);
 
     ChatMessage::Ptr msg;
     if (isAction)
     {
-        msg = ChatMessage::createChatMessage(authorStr, message, ChatMessage::ACTION, false);
+        msg = ChatMessage::createChatMessage(authorStr, message, ChatMessage::ACTION, authorIsActiveProfile);
         previousId.clear();
     }
     else
     {
-        msg = ChatMessage::createChatMessage(authorStr, message, ChatMessage::NORMAL, author.isActiveProfile());
+        msg = ChatMessage::createChatMessage(authorStr, message, ChatMessage::NORMAL, authorIsActiveProfile);
         if ( (author == previousId) && (prevMsgDateTime.secsTo(QDateTime::currentDateTime()) < getChatLog()->repNameAfter) )
             msg->hideSender();
 
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index 95f6fccc0..733a23afc 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -801,7 +801,7 @@ void Widget::setUsername(const QString& username)
     else
     {
         ui->nameLabel->setText(username);
-        ui->nameLabel->setToolTip(username);    // for overlength names
+        ui->nameLabel->setToolTip(username.toHtmlEscaped());    // for overlength names
     }
 
     QString sanename = username;
@@ -826,7 +826,7 @@ void Widget::setStatusMessage(const QString &statusMessage)
     else
     {
         ui->statusLabel->setText(statusMessage);
-        ui->statusLabel->setToolTip(statusMessage); // for overlength messsages
+        ui->statusLabel->setToolTip(statusMessage.toHtmlEscaped()); // for overlength messsages
     }
 }