diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 2f5d172a4..7dd9e2c85 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -69,6 +69,7 @@ set (UG_IMGS
   images/file-menu.png
   images/freemsg.png
   images/help-menu.png
+  images/JT4F.png
   images/jtalert.png
   images/keyboard-shortcuts.png
   images/log-qso.png
diff --git a/doc/user_guide/en/images/JT4F.png b/doc/user_guide/en/images/JT4F.png
new file mode 100644
index 000000000..7fb33839c
Binary files /dev/null and b/doc/user_guide/en/images/JT4F.png differ
diff --git a/doc/user_guide/en/vhf-features.adoc b/doc/user_guide/en/vhf-features.adoc
index b27dcb4a4..7d332a41d 100644
--- a/doc/user_guide/en/vhf-features.adoc
+++ b/doc/user_guide/en/vhf-features.adoc
@@ -112,14 +112,16 @@ is generally used for EME on the 5.7 and 10 GHz bands.
 of a single tone.  To activate automatic generation of these messages,
 check the box labeled *Sh*.
 
-- Select *Deep* from the *Decode* menu.  You may also choose to *Enable
-averaging* over successive transmissions and/or correlation decoding,
-*Enable deep Search*.
+- Select *Deep* from the *Decode* menu.  You may also choose to
+*Enable averaging* over successive transmissions and/or *Enable deep
+Search* (correlation decoding).
 
 image::decoding_depth.png[align="center",alt="Decoding Depth"]
 
-IMPORTANT: Additional hints for using JT4 and Echo mode on the
-*EME path have been compiled by G3WDG and are available here: {jt4eme}.
+The following screen shot shows one transmission from a 10 GHz EME
+QSO using submode JT4F.
+
+image::JT4F.png[align="center",alt="JT4F"]
 
 === JT65
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index d9f23491f..bc5cfbfd0 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2366,22 +2366,7 @@ void MainWindow::readFromStdout()                             //readFromStdout
     QByteArray t=proc_jt9.readLine();
     bool bAvgMsg=false;
     int navg=0;
-    if(m_mode=="JT4" or m_mode=="JT65" or m_mode=="QRA64") {
-      int n=t.indexOf("f");
-      if(n<0) n=t.indexOf("d");
-      if(n>0) {
-        QString tt=t.mid(n+1,1);
-        navg=tt.toInt();
-        if(navg==0) {
-          char c = tt.data()->toLatin1();
-          if(int(c)>=65 and int(c)<=90) navg=int(c)-54;
-        }
-        if(navg>1 or t.indexOf("f*")>0) bAvgMsg=true;
-      }
-    }
     if(t.indexOf("<DecodeFinished>") >= 0) {
-
-//###
       if(m_mode=="QRA64") {
         char name[512];
         QString fname=m_config.temp_dir ().absoluteFilePath ("red.dat");
@@ -2398,14 +2383,25 @@ void MainWindow::readFromStdout()                             //readFromStdout
 
         }
       }
-//###
-
       m_bDecoded = t.mid (20).trimmed ().toInt () > 0;
       if(!m_diskData) killFileTimer.start (3*1000*m_TRperiod/4); //Kill in 45 s
       decodeDone ();
       m_startAnother=m_loopall;
       return;
     } else {
+      if(m_mode=="JT4" or m_mode=="JT65" or m_mode=="QRA64") {
+        int n=t.indexOf("f");
+        if(n<0) n=t.indexOf("d");
+        if(n>0) {
+          QString tt=t.mid(n+1,1);
+          navg=tt.toInt();
+          if(navg==0) {
+            char c = tt.data()->toLatin1();
+            if(int(c)>=65 and int(c)<=90) navg=int(c)-54;
+          }
+          if(navg>1 or t.indexOf("f*")>0) bAvgMsg=true;
+        }
+      }
       QFile f {m_dataDir.absoluteFilePath ("ALL.TXT")};
       if (f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append)) {
         QTextStream out(&f);