diff --git a/src/blackgui/components/internalscomponent.cpp b/src/blackgui/components/internalscomponent.cpp
index a84825c72..423704abc 100644
--- a/src/blackgui/components/internalscomponent.cpp
+++ b/src/blackgui/components/internalscomponent.cpp
@@ -65,9 +65,9 @@ namespace BlackGui
             ui->le_TxtMsgTo->setValidator(new CUpperCaseValidator(ui->le_TxtMsgFrom));
             ui->le_AtisCallsign->setValidator(new CUpperCaseValidator(ui->le_AtisCallsign));
 
-            connect(ui->pb_SendAircraftPartsGui, &QPushButton::pressed, this, &CInternalsComponent::sendAircraftParts);
-            connect(ui->pb_SendAircraftPartsJson, &QPushButton::pressed, this, &CInternalsComponent::sendAircraftParts);
-            connect(ui->pb_CurrentParts, &QPushButton::pressed, this, &CInternalsComponent::setCurrentParts);
+            connect(ui->pb_SendAircraftPartsGui, &QPushButton::released, this, &CInternalsComponent::sendAircraftParts);
+            connect(ui->pb_SendAircraftPartsJson, &QPushButton::released, this, &CInternalsComponent::sendAircraftParts);
+            connect(ui->pb_CurrentParts, &QPushButton::released, this, &CInternalsComponent::setCurrentParts);
 
             connect(ui->cb_DebugContextAudio, &QCheckBox::stateChanged, this, &CInternalsComponent::enableDebug);
             connect(ui->cb_DebugContextApplication, &QCheckBox::stateChanged, this, &CInternalsComponent::enableDebug);
@@ -75,16 +75,18 @@ namespace BlackGui
             connect(ui->cb_DebugContextOwnAircraft, &QCheckBox::stateChanged, this, &CInternalsComponent::enableDebug);
             connect(ui->cb_DebugContextSimulator, &QCheckBox::stateChanged, this, &CInternalsComponent::enableDebug);
 
-            connect(ui->pb_SendTextMessage, &QPushButton::pressed, this, &CInternalsComponent::sendTextMessage);
-            connect(ui->tb_LogStatusMessage, &QPushButton::pressed, this, &CInternalsComponent::logStatusMessage);
+            connect(ui->pb_SendTextMessageDirectly, &QPushButton::released, this, &CInternalsComponent::sendTextMessage, Qt::QueuedConnection);
+            connect(ui->pb_SendTextMessageDeferred, &QPushButton::released, this, &CInternalsComponent::sendTextMessage, Qt::QueuedConnection);
+
+            connect(ui->tb_LogStatusMessage, &QPushButton::released, this, &CInternalsComponent::logStatusMessage);
             connect(ui->le_StatusMessage, &QLineEdit::returnPressed, this, &CInternalsComponent::logStatusMessage);
 
-            connect(ui->pb_LatestInterpolationLog, &QPushButton::pressed, this, &CInternalsComponent::showLogFiles);
-            connect(ui->pb_LatestPartsLog, &QPushButton::pressed, this, &CInternalsComponent::showLogFiles);
-            connect(ui->pb_RequestFromNetwork, &QPushButton::pressed, this, &CInternalsComponent::requestPartsFromNetwork);
-            connect(ui->pb_DisplayLog, &QPushButton::pressed, this, &CInternalsComponent::displayLogInSimulator);
+            connect(ui->pb_LatestInterpolationLog, &QPushButton::released, this, &CInternalsComponent::showLogFiles);
+            connect(ui->pb_LatestPartsLog, &QPushButton::released, this, &CInternalsComponent::showLogFiles);
+            connect(ui->pb_RequestFromNetwork, &QPushButton::released, this, &CInternalsComponent::requestPartsFromNetwork);
+            connect(ui->pb_DisplayLog, &QPushButton::released, this, &CInternalsComponent::displayLogInSimulator);
 
-            connect(ui->pb_SendAtis, &QPushButton::pressed, this, &CInternalsComponent::sendAtis);
+            connect(ui->pb_SendAtis, &QPushButton::released, this, &CInternalsComponent::sendAtis);
 
             connect(ui->comp_RemoteAircraftSelector, &CRemoteAircraftSelector::changedCallsign, this, &CInternalsComponent::selectorChanged);
             this->contextFlagsToGui();
@@ -187,6 +189,14 @@ namespace BlackGui
             if (ui->pte_TxtMsg->toPlainText().isEmpty()) { return; }
             if (ui->le_TxtMsgTo->text().isEmpty() && ui->dsb_TxtMsgFrequency->text().isEmpty()) { return; }
 
+            // send in some time
+            const QObject *senderObj = QObject::sender();
+            if (senderObj == ui->pb_SendTextMessageDeferred)
+            {
+                QTimer::singleShot(5000, this, &CInternalsComponent::sendTextMessage);
+                return;
+            }
+
             const CCallsign sender(ui->le_TxtMsgFrom->text().trimmed());
             const CCallsign recipient(ui->le_TxtMsgTo->text().trimmed());
             const QString msgTxt(ui->pte_TxtMsg->toPlainText().trimmed());
diff --git a/src/blackgui/components/internalscomponent.ui b/src/blackgui/components/internalscomponent.ui
index bd0556022..c9b1e6b90 100644
--- a/src/blackgui/components/internalscomponent.ui
+++ b/src/blackgui/components/internalscomponent.ui
@@ -185,21 +185,28 @@
           <property name="bottomMargin">
            <number>4</number>
           </property>
-          <item row="1" column="2" alignment="Qt::AlignLeft">
-           <widget class="QPushButton" name="pb_SendTextMessage">
-            <property name="text">
-             <string>send</string>
+          <item row="2" column="0" colspan="3">
+           <widget class="QPlainTextEdit" name="pte_TxtMsg">
+            <property name="placeholderText">
+             <string>Text message</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
+          <item row="0" column="0">
            <widget class="QLineEdit" name="le_TxtMsgFrom">
             <property name="placeholderText">
              <string>from</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="le_TxtMsgTo">
+            <property name="placeholderText">
+             <string>to</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
            <widget class="QDoubleSpinBox" name="dsb_TxtMsgFrequency">
             <property name="suffix">
              <string>MHz</string>
@@ -221,18 +228,36 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="2">
-           <widget class="QLineEdit" name="le_TxtMsgTo">
-            <property name="placeholderText">
-             <string>to</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1" colspan="3">
-           <widget class="QPlainTextEdit" name="pte_TxtMsg">
-            <property name="placeholderText">
-             <string>Text message</string>
-            </property>
+          <item row="1" column="1">
+           <widget class="QWidget" name="wi_SendTextMessageButtons" native="true">
+            <layout class="QHBoxLayout" name="wi_SendButtons">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QPushButton" name="pb_SendTextMessageDirectly">
+               <property name="text">
+                <string>send</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="pb_SendTextMessageDeferred">
+               <property name="text">
+                <string>send deferred</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
            </widget>
           </item>
          </layout>
@@ -651,18 +676,21 @@
   <tabstop>le_TxtMsgFrom</tabstop>
   <tabstop>le_TxtMsgTo</tabstop>
   <tabstop>dsb_TxtMsgFrequency</tabstop>
-  <tabstop>pb_SendTextMessage</tabstop>
+  <tabstop>pb_SendTextMessageDirectly</tabstop>
+  <tabstop>pb_SendTextMessageDeferred</tabstop>
   <tabstop>pte_TxtMsg</tabstop>
   <tabstop>le_AtisCallsign</tabstop>
   <tabstop>pb_SendAtis</tabstop>
   <tabstop>pte_Atis</tabstop>
+  <tabstop>pb_LatestInterpolationLog</tabstop>
+  <tabstop>pb_LatestPartsLog</tabstop>
   <tabstop>pb_DisplayLog</tabstop>
   <tabstop>pb_RequestFromNetwork</tabstop>
   <tabstop>tb_History</tabstop>
+  <tabstop>pb_CurrentParts</tabstop>
+  <tabstop>pb_SendAircraftPartsJson</tabstop>
   <tabstop>pb_SendAircraftPartsGui</tabstop>
   <tabstop>cb_AircraftPartsIncremental</tabstop>
-  <tabstop>pb_SendAircraftPartsJson</tabstop>
-  <tabstop>pb_CurrentParts</tabstop>
  </tabstops>
  <resources>
   <include location="../../blackmisc/blackmisc.qrc"/>