diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp
index 511034c2f..661afbfc6 100644
--- a/src/widget/form/chatform.cpp
+++ b/src/widget/form/chatform.cpp
@@ -216,8 +216,9 @@ void ChatForm::onFileRecvRequest(ToxFile file)
         previousId = friendId;
     }
 
-    chatWidget->insertMessage(ChatActionPtr(new FileTransferAction(fileTrans, getElidedName(name),
-                                                                   QTime::currentTime().toString("hh:mm"), false)));
+    QString dateStr = QTime::currentTime().toString(Settings::getInstance().getTimestampFormat());
+    FileTransferAction *fa = new FileTransferAction(fileTrans, getElidedName(name), dateStr, false);
+    chatWidget->insertMessage(ChatActionPtr(fa));
 
     if (!Settings::getInstance().getAutoAcceptDir(f->getToxID()).isEmpty()
      || Settings::getInstance().getAutoSaveEnabled())
diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp
index a047d9337..6dea94104 100644
--- a/src/widget/form/genericchatform.cpp
+++ b/src/widget/form/genericchatform.cpp
@@ -229,7 +229,9 @@ void GenericChatForm::addAlertMessage(const ToxID &author, QString message, QDat
         authorStr = author.publicKey;
 
     QString date = datetime.toString(Settings::getInstance().getTimestampFormat());
-    chatWidget->insertMessage(ChatActionPtr(new AlertAction(authorStr, message, date)));
+    MessageActionPtr ca = MessageActionPtr(new AlertAction(authorStr, message, date));
+    ca->markAsSent();
+    chatWidget->insertMessage(ca);
     previousId = author;
 }