diff --git a/logbook/WorkedBefore.cpp b/logbook/WorkedBefore.cpp
index daaf18fc7..31380b4c3 100644
--- a/logbook/WorkedBefore.cpp
+++ b/logbook/WorkedBefore.cpp
@@ -332,10 +332,15 @@ namespace
                                       // will parse a record
                       {
                         auto const& entity = prefixes->lookup (call);
+                        auto mode = extractField (record, "MODE").toUpper ();
+                        if (!mode.size () || "MFSK" == mode)
+                          {
+                            mode = extractField (record, "SUBMODE").toUpper ();
+                          }
                         worked.emplace (call.toUpper ()
                                         , extractField (record, "GRIDSQUARE").left (4).toUpper () // not interested in 6-digit grids
                                         , extractField (record, "BAND").toUpper ()
-                                        , extractField (record, "MODE").toUpper ()
+                                        , mode
                                         , entity.entity_name
                                         , entity.continent
                                         , entity.CQ_zone
diff --git a/logbook/logbook.cpp b/logbook/logbook.cpp
index b84b65c1a..e4a04f64a 100644
--- a/logbook/logbook.cpp
+++ b/logbook/logbook.cpp
@@ -69,7 +69,14 @@ QByteArray LogBook::QSOToADIF (QString const& hisCall, QString const& hisGrid, Q
   QString t;
   t = "<call:" + QString::number(hisCall.length()) + ">" + hisCall;
   t += " <gridsquare:" + QString::number(hisGrid.length()) + ">" + hisGrid;
-  t += " <mode:" + QString::number(mode.length()) + ">" + mode;
+  if (mode != "FT4")
+    {
+      t += " <mode:" + QString::number(mode.length()) + ">" + mode;
+    }
+  else
+    {
+      t += " <mode:4>MFSK <submode:" + QString::number(mode.length()) + ">" + mode;
+    }
   t += " <rst_sent:" + QString::number(rptSent.length()) + ">" + rptSent;
   t += " <rst_rcvd:" + QString::number(rptRcvd.length()) + ">" + rptRcvd;
   t += " <qso_date:8>" + dateTimeOn.date().toString("yyyyMMdd");