diff --git a/src/blackgui/textmessagetextedit.h b/src/blackgui/textmessagetextedit.h
index 35bd18eb3..6e6b5c4ea 100644
--- a/src/blackgui/textmessagetextedit.h
+++ b/src/blackgui/textmessagetextedit.h
@@ -82,7 +82,7 @@ namespace BlackGui
 
         BlackMisc::Network::CTextMessageList m_messages;
         QTextDocument *m_textDocument = nullptr;
-        int m_keepMaxMessages = 10;
+        int m_keepMaxMessages = -1; //!< max number of messages to keep, or -1 to keep all messages
         bool m_withSender = true;
         bool m_withRecipient = false;
         bool m_wordWrap = true;
diff --git a/src/blackmisc/network/textmessage.cpp b/src/blackmisc/network/textmessage.cpp
index fc7f3695d..328d5557a 100644
--- a/src/blackmisc/network/textmessage.cpp
+++ b/src/blackmisc/network/textmessage.cpp
@@ -59,6 +59,10 @@ namespace BlackMisc
         void CTextMessage::markAsSent()
         {
             m_wasSent = true;
+            if (!this->hasValidTimestamp())
+            {
+                this->setCurrentUtcTime();
+            }
         }
 
         QString CTextMessage::getRecipientCallsignOrFrequency() const
diff --git a/src/blackmisc/network/textmessage.h b/src/blackmisc/network/textmessage.h
index ba070e22b..ce4464fe7 100644
--- a/src/blackmisc/network/textmessage.h
+++ b/src/blackmisc/network/textmessage.h
@@ -150,6 +150,7 @@ namespace BlackMisc
             bool wasSent() const;
 
             //! Mark as sent
+            //! \remark also sets current timestamp if there is no valid timestamp
             void markAsSent();
 
             //! Get SELCAL code (if applicable, e.g. ABCD), otherwise ""