diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp
index ff69e7675..f610e92fe 100644
--- a/src/blackcore/context/contextnetworkimpl.cpp
+++ b/src/blackcore/context/contextnetworkimpl.cpp
@@ -264,10 +264,10 @@ namespace BlackCore
                     CLogMessage(this).validationError("Incorrect message");
                     return false;
                 }
-                QString receiver = parser.part(1).trimmed(); // receiver
 
                 // set receiver
-                CSimulatedAircraft ownAircraft(this->getIContextOwnAircraft()->getOwnAircraft());
+                const QString receiver = parser.part(1).trimmed(); // receiver
+                const CSimulatedAircraft ownAircraft(this->getIContextOwnAircraft()->getOwnAircraft());
                 if (ownAircraft.getCallsign().isEmpty())
                 {
                     CLogMessage(this).validationError("No own callsign");
diff --git a/src/blackcore/vatsim/networkvatlib.cpp b/src/blackcore/vatsim/networkvatlib.cpp
index bddf80972..77a196642 100644
--- a/src/blackcore/vatsim/networkvatlib.cpp
+++ b/src/blackcore/vatsim/networkvatlib.cpp
@@ -1108,7 +1108,7 @@ namespace BlackCore
             // Wait maximum 3 seconds for the reply and release as text message after
             if (pendingQuery.m_queryTime.secsTo(QDateTime::currentDateTimeUtc()) > 3)
             {
-                QString atisMessage(pendingQuery.m_atisMessage.join(QChar::LineFeed));
+                const QString atisMessage(pendingQuery.m_atisMessage.join(QChar::LineFeed));
                 CTextMessage tm(atisMessage, sender, receiver);
                 tm.setCurrentUtcTime();
                 consolidateTextMessage(tm);
diff --git a/src/blackmisc/network/textmessage.cpp b/src/blackmisc/network/textmessage.cpp
index 3b18c7e16..07c92c91a 100644
--- a/src/blackmisc/network/textmessage.cpp
+++ b/src/blackmisc/network/textmessage.cpp
@@ -27,13 +27,13 @@ namespace BlackMisc
     namespace Network
     {
         CTextMessage::CTextMessage(const QString &message, const CFrequency &frequency, const CCallsign &senderCallsign)
-            : m_message(message), m_senderCallsign(senderCallsign), m_frequency(frequency)
+            : m_message(message.trimmed().simplified()), m_senderCallsign(senderCallsign), m_frequency(frequency)
         {
             m_frequency.switchUnit(PhysicalQuantities::CFrequencyUnit::MHz());
         }
 
         CTextMessage::CTextMessage(const QString &message, const CCallsign &senderCallsign, const CCallsign &recipientCallsign)
-            : m_message(message), m_senderCallsign(senderCallsign), m_recipientCallsign(recipientCallsign), m_frequency(0, nullptr)
+            : m_message(message.trimmed().simplified()), m_senderCallsign(senderCallsign), m_recipientCallsign(recipientCallsign), m_frequency(0, nullptr)
         {}
 
         QString CTextMessage::convertToQString(bool i18n) const
diff --git a/src/blackmisc/network/textmessage.h b/src/blackmisc/network/textmessage.h
index a1ceddc57..441bbf720 100644
--- a/src/blackmisc/network/textmessage.h
+++ b/src/blackmisc/network/textmessage.h
@@ -89,7 +89,7 @@ namespace BlackMisc
             bool isEmpty() const { return m_message.isEmpty(); }
 
             //! Set message
-            void setMessage(const QString &message) { m_message = message.trimmed(); }
+            void setMessage(const QString &message) { m_message = message.trimmed().simplified(); }
 
             //! Get frequency
             const PhysicalQuantities::CFrequency &getFrequency() const { return m_frequency; }