diff --git a/src/sbbs3/ctrl/TelnetCfgDlgUnit.cpp b/src/sbbs3/ctrl/TelnetCfgDlgUnit.cpp
index cf43bc2ee70929f0c855441a9a7d5d86d7ff89e4..31b2947c294bc56b656cf80909b8a298d8f08273 100644
--- a/src/sbbs3/ctrl/TelnetCfgDlgUnit.cpp
+++ b/src/sbbs3/ctrl/TelnetCfgDlgUnit.cpp
@@ -95,6 +95,8 @@ void __fastcall TTelnetCfgDlg::FormShow(TObject *Sender)
         =MainForm->bbs_startup.options&BBS_OPT_ALLOW_RLOGIN;
     RLogin2ndNameCheckBox->Checked
         =MainForm->bbs_startup.options&BBS_OPT_USE_2ND_RLOGIN;
+    QWKEventsCheckBox->Checked
+        =!(MainForm->bbs_startup.options&BBS_OPT_NO_QWK_EVENTS);
 
     RLoginEnabledCheckBoxClick(Sender);
     PageControl->ActivePage=GeneralTabSheet;
@@ -164,6 +166,10 @@ void __fastcall TTelnetCfgDlg::OKBtnClick(TObject *Sender)
     	MainForm->bbs_startup.options|=BBS_OPT_XTRN_MINIMIZED;
     else
 	    MainForm->bbs_startup.options&=~BBS_OPT_XTRN_MINIMIZED;
+    if(QWKEventsCheckBox->Checked==true)
+        MainForm->bbs_startup.options&=~BBS_OPT_NO_QWK_EVENTS;
+    else
+        MainForm->bbs_startup.options|=BBS_OPT_NO_QWK_EVENTS;
     if(AutoLogonCheckBox->Checked==true)
     	MainForm->bbs_startup.options|=BBS_OPT_AUTO_LOGON;
     else
diff --git a/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm b/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm
index 1374f4537584b454c70d4eebbcb2978f72d17093..222cacce8f383c79c46fd5a3cae69e67586f1623 100644
--- a/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm
+++ b/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm
@@ -90,6 +90,17 @@ object TelnetCfgDlg: TTelnetCfgDlg
         ShowHint = True
         TabOrder = 4
       end
+      object QWKEventsCheckBox: TCheckBox
+        Left = 182
+        Top = 108
+        Width = 144
+        Height = 25
+        Hint = 'Handle QWK Message Packet Events in This Instance'
+        Caption = 'QWK Msg Events'
+        ParentShowHint = False
+        ShowHint = True
+        TabOrder = 5
+      end
     end
     object TelnetTabSheet: TTabSheet
       Caption = 'Telnet'
diff --git a/src/sbbs3/ctrl/TelnetCfgDlgUnit.h b/src/sbbs3/ctrl/TelnetCfgDlgUnit.h
index f111cab4105f61359c87d72479d5ed5881691214..bf48939c8ffe8c14e749c5a3e924a9afba50ac97 100644
--- a/src/sbbs3/ctrl/TelnetCfgDlgUnit.h
+++ b/src/sbbs3/ctrl/TelnetCfgDlgUnit.h
@@ -89,6 +89,7 @@ __published:
     TCheckBox *RLoginEnabledCheckBox;
     TButton *RLoginIPallowButton;
     TCheckBox *RLogin2ndNameCheckBox;
+        TCheckBox *QWKEventsCheckBox;
 	void __fastcall FormShow(TObject *Sender);
 	void __fastcall OKBtnClick(TObject *Sender);
 	void __fastcall AnswerSoundButtonClick(TObject *Sender);