diff --git a/src/sbbs3/ctrl/MailCfgDlgUnit.cpp b/src/sbbs3/ctrl/MailCfgDlgUnit.cpp
index 3e3e286c0a703f820dc7c69e310af2148af6eec3..a080ff5ab75acc93b419e363588d4be30e6832f7 100644
--- a/src/sbbs3/ctrl/MailCfgDlgUnit.cpp
+++ b/src/sbbs3/ctrl/MailCfgDlgUnit.cpp
@@ -113,6 +113,8 @@ void __fastcall TMailCfgDlg::FormShow(TObject *Sender)
 
     DebugTXCheckBox->Checked=MainForm->mail_startup.options
         &MAIL_OPT_DEBUG_TX;
+    DebugRXCheckBox->Checked=MainForm->mail_startup.options
+        &MAIL_OPT_DEBUG_RX_RSP;
     DebugHeadersCheckBox->Checked=MainForm->mail_startup.options
         &MAIL_OPT_DEBUG_RX_HEADER;
     POP3EnabledCheckBox->Checked=MainForm->mail_startup.options
@@ -206,6 +208,10 @@ void __fastcall TMailCfgDlg::OKBtnClick(TObject *Sender)
     	MainForm->mail_startup.options|=MAIL_OPT_DEBUG_TX;
     else
 	    MainForm->mail_startup.options&=~MAIL_OPT_DEBUG_TX;
+	if(DebugRXCheckBox->Checked==true)
+    	MainForm->mail_startup.options|=MAIL_OPT_DEBUG_RX_RSP;
+    else
+	    MainForm->mail_startup.options&=~MAIL_OPT_DEBUG_RX_RSP;
 	if(DebugHeadersCheckBox->Checked==true)
     	MainForm->mail_startup.options|=MAIL_OPT_DEBUG_RX_HEADER;
     else
diff --git a/src/sbbs3/ctrl/MailCfgDlgUnit.dfm b/src/sbbs3/ctrl/MailCfgDlgUnit.dfm
index c88269aff158a585b09f2db2b689c6fea7d0a665..06543422bd7453e17cede2b37e5c63f6e05cfff6 100644
--- a/src/sbbs3/ctrl/MailCfgDlgUnit.dfm
+++ b/src/sbbs3/ctrl/MailCfgDlgUnit.dfm
@@ -53,8 +53,8 @@ object MailCfgDlg: TMailCfgDlg
     Top = 4
     Width = 342
     Height = 245
-    ActivePage = DNSBLTabSheet
-    TabIndex = 5
+    ActivePage = GeneralTabSheet
+    TabIndex = 0
     TabOrder = 3
     object GeneralTabSheet: TTabSheet
       Caption = 'General'
@@ -154,14 +154,14 @@ object MailCfgDlg: TMailCfgDlg
         Width = 146
         Height = 24
         Hint = 'Log all transmitted mail commands and responses (for debugging)'
-        Caption = 'Log TX'
+        Caption = 'Log Transmissions'
         ParentShowHint = False
         ShowHint = True
         TabOrder = 6
       end
       object LogFileCheckBox: TCheckBox
         Left = 185
-        Top = 108
+        Top = 140
         Width = 146
         Height = 24
         Hint = 'Save log entries to a file (in your DATA directory)'
@@ -182,6 +182,17 @@ object MailCfgDlg: TMailCfgDlg
         ShowHint = True
         TabOrder = 5
       end
+      object DebugRXCheckBox: TCheckBox
+        Left = 185
+        Top = 108
+        Width = 146
+        Height = 24
+        Hint = 'Log all transmitted mail commands and responses (for debugging)'
+        Caption = 'Log Responses'
+        ParentShowHint = False
+        ShowHint = True
+        TabOrder = 8
+      end
     end
     object SMTPTabSheet: TTabSheet
       Caption = 'SMTP'
diff --git a/src/sbbs3/ctrl/MailCfgDlgUnit.h b/src/sbbs3/ctrl/MailCfgDlgUnit.h
index 8b47f530d7fb40b1c22382b88b48d87f97c72722..fe1c1a12b1667101b72ae8a581e9662aafc301e5 100644
--- a/src/sbbs3/ctrl/MailCfgDlgUnit.h
+++ b/src/sbbs3/ctrl/MailCfgDlgUnit.h
@@ -122,6 +122,7 @@ __published:
 	TLabel *MaxRecipientsLabel;
 	TEdit *MaxRecipientsEdit;
 	TButton *DNSBLExemptionsButton;
+	TCheckBox *DebugRXCheckBox;
     void __fastcall InboundSoundButtonClick(TObject *Sender);
     void __fastcall OutboundSoundButtonClick(TObject *Sender);
     void __fastcall FormShow(TObject *Sender);