diff --git a/src/sbbs3/useredit/MainFormUnit.cpp b/src/sbbs3/useredit/MainFormUnit.cpp
index 78ac3e15bd94b28b5293f0ee68c45331fe97bba0..139b5f33b0b5255fbed9e59839a60bee25d5bf33 100644
--- a/src/sbbs3/useredit/MainFormUnit.cpp
+++ b/src/sbbs3/useredit/MainFormUnit.cpp
@@ -201,18 +201,24 @@ void __fastcall TMainForm::GetUserData(int number)
     LogonCheckListBox->Tag = false;
 
     // Appy 'QWK' bit-field
-    QWKCheckListBox->Checked[0] = user.qwk & QWK_FILES;
-    QWKCheckListBox->Checked[1] = user.qwk & QWK_EMAIL;
-    QWKCheckListBox->Checked[2] = user.qwk & QWK_ALLMAIL;
-    QWKCheckListBox->Checked[3] = user.qwk & QWK_DELMAIL;
-    QWKCheckListBox->Checked[4] = user.qwk & QWK_BYSELF;
-    QWKCheckListBox->Checked[5] = user.qwk & QWK_EXPCTLA;
-    QWKCheckListBox->Checked[6] = !(user.qwk & QWK_RETCTLA);
-    QWKCheckListBox->Checked[7] = user.qwk & QWK_ATTACH;
-    QWKCheckListBox->Checked[8] = user.qwk & QWK_NOINDEX;
-    QWKCheckListBox->Checked[9] = user.qwk & QWK_TZ;
-    QWKCheckListBox->Checked[10] = user.qwk & QWK_VIA;
-    QWKCheckListBox->Checked[11] = !(user.qwk & QWK_NOCTRL);
+	int i = 0;
+	QWKCheckListBox->Checked[i++] = user.qwk & QWK_EXT;
+    QWKCheckListBox->Checked[i++] = !(user.qwk & QWK_RETCTLA);
+    QWKCheckListBox->Checked[i++] = user.qwk & QWK_EXPCTLA;
+	QWKCheckListBox->Checked[i++] = user.qwk & QWK_UTF8;
+    QWKCheckListBox->Checked[i++] = user.qwk & QWK_FILES;
+    QWKCheckListBox->Checked[i++] = user.qwk & QWK_ATTACH;
+    QWKCheckListBox->Checked[i++] = user.qwk & QWK_BYSELF;
+    QWKCheckListBox->Checked[i++] = user.qwk & QWK_EMAIL;
+    QWKCheckListBox->Checked[i++] = user.qwk & QWK_ALLMAIL;
+    QWKCheckListBox->Checked[i++] = user.qwk & QWK_DELMAIL;
+    QWKCheckListBox->Checked[i++] = user.qwk & QWK_NOINDEX;
+    QWKCheckListBox->Checked[i++] = !(user.qwk & QWK_NOCTRL);
+    QWKCheckListBox->Checked[i++] = user.qwk & QWK_TZ;
+    QWKCheckListBox->Checked[i++] = user.qwk & QWK_VIA;
+	QWKCheckListBox->Checked[i++] = user.qwk & QWK_MSGID;
+	QWKCheckListBox->Checked[i++] = user.qwk & QWK_HEADERS;
+	QWKCheckListBox->Checked[i++] = user.qwk & QWK_VOTING;
     QWKCheckListBox->Tag = false;
 
     // Apply 'chat' bit-field
@@ -377,18 +383,24 @@ void __fastcall TMainForm::PutUserData(int number)
     }
 
     if(QWKCheckListBox->Tag) {
-        SetBit( QWKCheckListBox->Checked[0], user.qwk, QWK_FILES);
-        SetBit( QWKCheckListBox->Checked[1], user.qwk, QWK_EMAIL);
-        SetBit( QWKCheckListBox->Checked[2], user.qwk, QWK_ALLMAIL);
-        SetBit( QWKCheckListBox->Checked[3], user.qwk, QWK_DELMAIL);
-        SetBit( QWKCheckListBox->Checked[4], user.qwk, QWK_BYSELF);
-        SetBit( QWKCheckListBox->Checked[5], user.qwk, QWK_EXPCTLA);
-        SetBit(!QWKCheckListBox->Checked[6], user.qwk, QWK_RETCTLA);
-        SetBit( QWKCheckListBox->Checked[7], user.qwk, QWK_ATTACH);
-        SetBit( QWKCheckListBox->Checked[8], user.qwk, QWK_NOINDEX);
-        SetBit( QWKCheckListBox->Checked[9], user.qwk, QWK_TZ);
-        SetBit( QWKCheckListBox->Checked[10], user.qwk, QWK_VIA);
-        SetBit(!QWKCheckListBox->Checked[11], user.qwk, QWK_NOCTRL);
+		int i = 0;
+		SetBit( QWKCheckListBox->Checked[i++], user.qwk, QWK_EXT);
+        SetBit(!QWKCheckListBox->Checked[i++], user.qwk, QWK_RETCTLA);
+        SetBit( QWKCheckListBox->Checked[i++], user.qwk, QWK_EXPCTLA);
+		SetBit( QWKCheckListBox->Checked[i++], user.qwk, QWK_UTF8);
+        SetBit( QWKCheckListBox->Checked[i++], user.qwk, QWK_FILES);
+        SetBit( QWKCheckListBox->Checked[i++], user.qwk, QWK_ATTACH);
+        SetBit( QWKCheckListBox->Checked[i++], user.qwk, QWK_BYSELF);
+        SetBit( QWKCheckListBox->Checked[i++], user.qwk, QWK_EMAIL);
+        SetBit( QWKCheckListBox->Checked[i++], user.qwk, QWK_ALLMAIL);
+        SetBit( QWKCheckListBox->Checked[i++], user.qwk, QWK_DELMAIL);
+        SetBit( QWKCheckListBox->Checked[i++], user.qwk, QWK_NOINDEX);
+        SetBit(!QWKCheckListBox->Checked[i++], user.qwk, QWK_NOCTRL);
+        SetBit( QWKCheckListBox->Checked[i++], user.qwk, QWK_TZ);
+        SetBit( QWKCheckListBox->Checked[i++], user.qwk, QWK_VIA);
+		SetBit( QWKCheckListBox->Checked[i++], user.qwk, QWK_MSGID);
+		SetBit( QWKCheckListBox->Checked[i++], user.qwk, QWK_HEADERS);
+		SetBit( QWKCheckListBox->Checked[i++], user.qwk, QWK_VOTING);
 
         putuserqwk(&cfg, user.number, user.qwk);
     }
diff --git a/src/sbbs3/useredit/MainFormUnit.dfm b/src/sbbs3/useredit/MainFormUnit.dfm
index f146ad31705fe3591b3e981245ed929d41c438ac..c72ddcec36531c65a91acbc8904d95e47aa93908 100644
--- a/src/sbbs3/useredit/MainFormUnit.dfm
+++ b/src/sbbs3/useredit/MainFormUnit.dfm
@@ -1110,18 +1110,23 @@ object MainForm: TMainForm
             Anchors = [akLeft, akTop, akRight]
             ItemHeight = 13
             Items.Strings = (
+			  'Include QWKE Extensions'
+              'Strip Ctrl-A codes'
+              'Expand Ctrl-A Codes to ANSI'
+			  'Include UTF-8 Characters'
               'Include New Files List'
+              'Include File Attachments'
+              'Include Messages From Self'
               'Include Unread Email'
               'Include ALL Email'
-              'Delete Email After Download'
-              'Include Messages From Self'
-              'Expand Ctrl-A Codes to ANSI'
-              'Strip Ctrl-A codes'
-              'Include File Attachments'
+              'Delete Downloaded E-mail'
               'Include Index Files'
-              'Include Time Zone (@TZ)'
-              'Include Seen-Bys (@VIA)'
-              'Extraneous Control Files')
+              'Include Control Files'
+              'Include Time Zone Kludges'
+              'Include Via/Routing Kludges'
+			  'Include Message-ID Kludges'
+			  'Include HEADERS.DAT File'
+			  'Include VOTING.DAT File')
             TabOrder = 0
           end
         end