diff --git a/src/blackgui/components/modelmatcherlogenable.cpp b/src/blackgui/components/modelmatcherlogenable.cpp
index fb38a8883..8a7f506d5 100644
--- a/src/blackgui/components/modelmatcherlogenable.cpp
+++ b/src/blackgui/components/modelmatcherlogenable.cpp
@@ -17,6 +17,7 @@
 
 using namespace BlackCore;
 using namespace BlackCore::Context;
+using namespace BlackMisc::Simulation;
 
 namespace BlackGui
 {
@@ -27,14 +28,15 @@ namespace BlackGui
             ui(new Ui::CModelMatcherLogEnable)
         {
             ui->setupUi(this);
-            connect(ui->cb_LogReverseLookup, &QCheckBox::toggled, this, &CModelMatcherLogEnable::enabledCheckboxChanged);
-            connect(ui->cb_LogMatchingMessages, &QCheckBox::toggled, this, &CModelMatcherLogEnable::enabledCheckboxChanged);
+            connect(ui->cb_LogReverseLookup,    &QCheckBox::toggled, this, &CModelMatcherLogEnable::enabledCheckboxChanged, Qt::QueuedConnection);
+            connect(ui->cb_LogMatchingMessages, &QCheckBox::toggled, this, &CModelMatcherLogEnable::enabledCheckboxChanged, Qt::QueuedConnection);
+            connect(ui->cb_LogDetailed,         &QCheckBox::toggled, this, &CModelMatcherLogEnable::enabledCheckboxChanged, Qt::QueuedConnection);
 
             if (this->hasContexts())
             {
                 connect(sGui->getIContextSimulator(), &IContextSimulator::changedLogOrDebugSettings, this, &CModelMatcherLogEnable::valuesChanged, Qt::QueuedConnection);
-                connect(sGui->getIContextNetwork(), &IContextNetwork::changedLogOrDebugSettings, this, &CModelMatcherLogEnable::valuesChanged, Qt::QueuedConnection);
-                connect(sGui->getIContextNetwork(), &IContextNetwork::connectionStatusChanged, this, &CModelMatcherLogEnable::connectionStatusChanged, Qt::QueuedConnection);
+                connect(sGui->getIContextNetwork(),   &IContextNetwork::changedLogOrDebugSettings,   this, &CModelMatcherLogEnable::valuesChanged, Qt::QueuedConnection);
+                connect(sGui->getIContextNetwork(),   &IContextNetwork::connectionStatusChanged,     this, &CModelMatcherLogEnable::connectionStatusChanged, Qt::QueuedConnection);
             }
 
             QPointer<CModelMatcherLogEnable> myself(this);
@@ -62,13 +64,28 @@ namespace BlackGui
         {
             if (!this->hasContexts()) { return; }
             const QObject *sender = QObject::sender();
-            if (sender == ui->cb_LogReverseLookup)
+
+            const bool detailed  = (sender == ui->cb_LogDetailed)         ? enabled : ui->cb_LogDetailed->isChecked();
+            const bool reverse   = (sender == ui->cb_LogReverseLookup)    ? enabled : ui->cb_LogReverseLookup->isChecked();
+            const bool matching  = (sender == ui->cb_LogMatchingMessages) ? enabled : ui->cb_LogMatchingMessages->isChecked();
+            const bool simplified = !detailed;
+
+            if (sender == ui->cb_LogReverseLookup || sender == ui->cb_LogDetailed)
             {
-                sGui->getIContextNetwork()->enableReverseLookupMessages(enabled);
+                ReverseLookupLogging revLog = RevLogDisabled;
+                if (reverse && simplified) { revLog = RevLogEnabledSimplified; }
+                else if (reverse) { revLog = RevLogEnabled; }
+
+                sGui->getIContextNetwork()->enableReverseLookupMessages(revLog);
             }
-            else if (sender == ui->cb_LogMatchingMessages)
+
+            if (sender == ui->cb_LogMatchingMessages || sender == ui->cb_LogDetailed)
             {
-                sGui->getIContextSimulator()->enableMatchingMessages(enabled);
+                MatchingLog matchingLog = MatchingLogNothing;
+                if (matching && simplified) { matchingLog = MatchingLogSimplified; }
+                else if (matching) { matchingLog = MatchingLogAll; }
+
+                sGui->getIContextSimulator()->enableMatchingMessages(matchingLog);
             }
         }
 
@@ -77,17 +94,17 @@ namespace BlackGui
             if (this->hasContexts())
             {
                 // avoid signal roundtrips
-                bool c = sGui->getIContextNetwork()->isReverseLookupMessagesEnabled();
-                if (c != ui->cb_LogReverseLookup->isChecked())
-                {
-                    ui->cb_LogReverseLookup->setChecked(c);
-                }
+                const ReverseLookupLogging revLog = sGui->getIContextNetwork()->isReverseLookupMessagesEnabled();
+                const bool revLogEnabled = revLog.testFlag(RevLogEnabled);
+                if (revLogEnabled != ui->cb_LogReverseLookup->isChecked()) { ui->cb_LogReverseLookup->setChecked(revLogEnabled); }
 
-                c = sGui->getIContextSimulator()->isMatchingMessagesEnabled();
-                if (c != ui->cb_LogMatchingMessages->isChecked())
-                {
-                    ui->cb_LogMatchingMessages->setChecked(c);
-                }
+                const MatchingLog matchingLog = sGui->getIContextSimulator()->isMatchingMessagesEnabled();
+                const bool matchingLogEnabled = matchingLog > 0;
+                if (matchingLogEnabled != ui->cb_LogMatchingMessages->isChecked()) { ui->cb_LogMatchingMessages->setChecked(matchingLogEnabled); }
+
+                const bool simplified = revLog.testFlag(RevLogSimplifiedInfo) || matchingLog == MatchingLogSimplified;
+                const bool detailed = !simplified;
+                if (detailed != ui->cb_LogDetailed->isChecked()) { ui->cb_LogDetailed->setChecked(detailed); }
             }
         }
 
diff --git a/src/blackgui/components/modelmatcherlogenable.h b/src/blackgui/components/modelmatcherlogenable.h
index a49360095..961c0b596 100644
--- a/src/blackgui/components/modelmatcherlogenable.h
+++ b/src/blackgui/components/modelmatcherlogenable.h
@@ -30,7 +30,7 @@ namespace BlackGui
             explicit CModelMatcherLogEnable(QWidget *parent = nullptr);
 
             //! Destructor
-            virtual ~CModelMatcherLogEnable();
+            virtual ~CModelMatcherLogEnable() override;
 
             //! Reverse lookup enabled?
             bool isReverseLookupLogEnabled() const;
diff --git a/src/blackgui/components/modelmatcherlogenable.ui b/src/blackgui/components/modelmatcherlogenable.ui
index dedcc71d6..66300005f 100644
--- a/src/blackgui/components/modelmatcherlogenable.ui
+++ b/src/blackgui/components/modelmatcherlogenable.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>276</width>
+    <width>287</width>
     <height>20</height>
    </rect>
   </property>
@@ -45,7 +45,7 @@
       <string>enable logging of reverse lookup messages</string>
      </property>
      <property name="text">
-      <string>rev. lookup msgs.</string>
+      <string>rev. lookup</string>
      </property>
     </widget>
    </item>
@@ -55,7 +55,17 @@
       <string>enable matching messages</string>
      </property>
      <property name="text">
-      <string>matching msgs.</string>
+      <string>matching</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="cb_LogDetailed">
+     <property name="toolTip">
+      <string>a simplified matching log (faster) or a detailed log (slower)</string>
+     </property>
+     <property name="text">
+      <string>detailed</string>
      </property>
     </widget>
    </item>