3 files changed, 19 insertions, 7 deletions

diff --git a/Mailman/Autoresponder.py b/Mailman/Autoresponder.py
index d21bfa10f..586f349fa 100644
--- a/Mailman/Autoresponder.py
+++ b/Mailman/Autoresponder.py
@@ -41,6 +41,8 @@ class Autoresponder:
         self.request_responses = {}
 
     def GetConfigInfo(self):
+        WIDTH = mm_cfg.TEXTFIELDWIDTH
+
         return [
             """Auto-responder characteristics.<p>
 
@@ -59,14 +61,16 @@ box, or you can specify a file on your local system to upload as the text.""",
             ('autorespond_postings', mm_cfg.Toggle, ('No', 'Yes'), 0,
              'Should Mailman send an auto-response to mailing list posters?'),
 
-            ('autoresponse_postings_text', mm_cfg.FileUpload, ('6', '30'), 0,
+            ('autoresponse_postings_text', mm_cfg.FileUpload,
+             (6, WIDTH), 0,
              'Auto-response text to send to mailing list posters.'),
 
             ('autorespond_admin', mm_cfg.Toggle, ('No', 'Yes'), 0,
              '''Should Mailman send an auto-response to emails sent to the
 -admin address?'''),
 
-            ('autoresponse_admin_text', mm_cfg.FileUpload, ('6', '30'), 0,
+            ('autoresponse_admin_text', mm_cfg.FileUpload,
+             (6, WIDTH), 0,
              'Auto-response text to send to -admin emails.'),
 
             ('autorespond_requests', mm_cfg.Radio,
@@ -76,7 +80,8 @@ box, or you can specify a file on your local system to upload as the text.""",
 discard the original email, or forward it on to the system as a normal mail
 command.'''),
 
-            ('autoresponse_request_text', mm_cfg.FileUpload, ('6', '30'), 0,
+            ('autoresponse_request_text', mm_cfg.FileUpload,
+             (6, WIDTH), 0,
              'Auto-response text to send to -request emails.'),
 
             ('autoresponse_graceperiod', mm_cfg.Number, 3, 0,
diff --git a/Mailman/Digester.py b/Mailman/Digester.py
index ce9b907c5..c6c033130 100644
--- a/Mailman/Digester.py
+++ b/Mailman/Digester.py
@@ -38,6 +38,8 @@ class Digester:
 	self.next_digest_number = 1
 
     def GetConfigInfo(self):
+        WIDTH = mm_cfg.TEXTFIELDWIDTH
+
 	return [
             "Batched-delivery digest characteristics.",
 
@@ -61,13 +63,13 @@ class Digester:
 	     'Should a digest be dispatched daily when the size threshold '
 	     "isn't reached?"),
 
-            ('digest_header', mm_cfg.Text, (4, 55), 0,
+            ('digest_header', mm_cfg.Text, (4, WIDTH), 0,
 	     'Header added to every digest',
              "Text attached (as an initial message, before the table"
              " of contents) to the top of digests.<p>"
              + Errors.MESSAGE_DECORATION_NOTE),
 
-	    ('digest_footer', mm_cfg.Text, (4, 55), 0,
+	    ('digest_footer', mm_cfg.Text, (4, WIDTH), 0,
 	     'Footer added to every digest',
              "Text attached (as a final message) to the bottom of digests.<p>"
              + Errors.MESSAGE_DECORATION_NOTE),
diff --git a/Mailman/GatewayManager.py b/Mailman/GatewayManager.py
index 931a67dec..1bba6e36b 100644
--- a/Mailman/GatewayManager.py
+++ b/Mailman/GatewayManager.py
@@ -34,20 +34,25 @@ class GatewayManager:
         self.gateway_to_mail  = 0
 
     def GetConfigInfo(self):
+        WIDTH = mm_cfg.TEXTFIELDWIDTH
+
         return [
             'Mail-to-News and News-to-Mail gateway services.',
-            ('nntp_host', mm_cfg.String, 50, 0,
+            ('nntp_host', mm_cfg.String, WIDTH, 0,
              'The Internet address of the machine your News server '
              'is running on.',
              'The News server is not part of Mailman proper.  You have to '
              'already have access to a NNTP server, and that NNTP server '
              'has to recognize the machine this mailing list runs on as '
              'a machine capable of reading and posting news.'),
-            ('linked_newsgroup', mm_cfg.String, 50, 0,
+
+            ('linked_newsgroup', mm_cfg.String, WIDTH, 0,
               'The name of the Usenet group to gateway to and/or from.'),
+
             ('gateway_to_news',  mm_cfg.Toggle, ('No', 'Yes'), 0,
              'Should posts to the mailing list be resent to the '
              'newsgroup?'),
+
             ('gateway_to_mail',  mm_cfg.Toggle, ('No', 'Yes'), 0,
              'Should newsgroup posts not sent from the list be resent '
              'to the list?')