diff --git a/mainwindow.cpp b/mainwindow.cpp
index ea210a2e5..b70a87e7e 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -10,6 +10,7 @@
 #include <QLineEdit>
 #include <QRegExpValidator>
 #include <QRegExp>
+#include <QRegularExpression>
 #include <QDesktopServices>
 #include <QUrl>
 #include <QStandardPaths>
@@ -5035,11 +5036,7 @@ void MainWindow::replyToCQ (QTime time, qint32 snr, float delta_time, quint32 de
       return;
     }
 
-  auto decode_parts = message_text.split (' ', QString::SkipEmptyParts);
-
-  if (decode_parts[0] == "CQ"
-      || decode_parts[0] == "CQDX"
-      || decode_parts[0] == "QRZ")
+  if (message_text.contains (QRegularExpression {R"(^(CQ |CQDX |QRZ ))"}))
     {
       // a message we are willing to accept
       QString format_string {"%1 %2 %3 %4 %5  %6"};
diff --git a/mainwindow.ui b/mainwindow.ui
index 5c3cec388..32a7a58c1 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -2,14 +2,6 @@
 <ui version="4.0">
  <class>MainWindow</class>
  <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>896</width>
-    <height>565</height>
-   </rect>
-  </property>
   <property name="windowTitle">
    <string>WSJT-X   by K1JT</string>
   </property>
@@ -2284,14 +2276,6 @@ QPushButton[state=&quot;ok&quot;] {
    </layout>
   </widget>
   <widget class="QMenuBar" name="menuBar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>896</width>
-     <height>21</height>
-    </rect>
-   </property>
    <widget class="QMenu" name="menuFile">
     <property name="title">
      <string>File</string>