diff --git a/mailboxes/config.info b/mailboxes/config.info
index 0084cd6ff..faa92bec4 100644
--- a/mailboxes/config.info
+++ b/mailboxes/config.info
@@ -2,7 +2,7 @@ line0=User interface options,11
 wrap_width=Width to wrap mail messages at,0,6
 wrap_compose=Width to wrap composed mail messages at,10,-Don't wrap,80-80 columns (standard),Other size
 perpage=Mail messages to display per page,0,6
-show_to=Show To: address in mailboxes?,1,1-Yes,0-No
+show_to=Show <tt>To:</tt> address in mailboxes?,1,1-Yes,0-No
 top_buttons=Show buttons at top for,1,2-Mailboxes and mails,1-Mailboxes only,0-Never
 arrows=Show pager arrows at bottom for,1,2-Mailboxes and mails,1-Mailboxes only,0-Never
 show_delall=Show button to delete entire mailbox?,1,1-Yes,0-No
@@ -13,10 +13,10 @@ view_html=Show message body as,4,0-Always plain text,1-Text if possible&#44; HTM
 view_images=Show inline images by default?,1,0-Yes&#44; client fetched,3-Yes&#44; server fetched,1-No external images,2-No
 html_edit=Use HTML editor for composing?,4,2-Always,1-When replying to HTML email,0-Never
 html_edit_mode=HTML editor toolbar mode?,4,basic-Basic,simple-Simple,advanced-Advanced
-html_quote=HTML quoting mode,1,1-Message below &lt;hr&gt;,0-Message inside &lt;blockquote&gt;
+html_quote=HTML quoting mode,1,1-Message below <tt>&lt;hr&gt;</tt>,0-Message inside <tt>&lt;blockquote&gt;</tt>
 log_read=Record the reading of mail in the Webmin Actions Log?,1,1-Yes,0-No
-bcc_to=Bcc: sent messages to,0
-sig_file=Signature file,10,*-None,.signature-~/.signature,Other file
+bcc_to=<tt>Bcc:</tt> sent messages to,0
+sig_file=Signature file,10,*-None,.signature-<tt>~/.signature</tt>,Other file
 show_body=Show message body previews in list?,1,1-Yes,0-No
 open_mode=Open messages in,1,1-New window,0-List window
 link_mode=Open links in,1,1-New window,0-Same window
@@ -46,27 +46,27 @@ noindex_hostname=Include hostname in index files?,1,0-Yes,1-No
 line3=Spam options,11
 spam_buttons=Show spam reporting buttons for,2,list-Mailboxes,mail-Messages
 spam_del=Delete spam when reporting?,1,1-Yes,0-No
-spam_report=Report spam using,1,sa_learn-sa&#45;learn --spam,spamassassin-spamassasin -r,-Decide automatically
+spam_report=Report spam using,1,sa_learn-<tt>sa&#45;learn --spam</tt>,spamassassin-<tt>spamassasin -r</tt>,-Decide automatically
 
 line3.5=From address options,11
-from_addr=From: address to use when sending email manually,3,From mailbox username
-webmin_from=From: address to use when Webmin sends email,3,Default (webmin@<i>yourhost</i>)
-from_virtualmin=Get From: address from Virtualmin?,1,1-Yes,0-No
-from_dom=Domain to use in From: address,3,System hostname
-no_orig_ip=Include browser IP in X-Originating-IP header?,1,0-Yes,1-No
-no_mailer=Include Webmin version in X-Mailer header?,1,0-Yes,1-No
-helo_name=Hostname to use in SMTP HELO line,3,Same as system hostname
+from_addr=<tt>From:</tt> address to use when sending email manually,3,From mailbox username
+webmin_from=<tt>From:</tt> address to use when Webmin sends email,3,Default (<tt>webmin@<i>yourhost</i></tt>)
+from_virtualmin=Get <tt>From:</tt> address from Virtualmin?,1,1-Yes,0-No
+from_dom=Domain to use in <tt>From:</tt> address,3,System hostname
+no_orig_ip=Include browser IP in <tt>X-Originating</tt>-IP header?,1,0-Yes,1-No
+no_mailer=Include Webmin version in <tt>X-Mailer</tt> header?,1,0-Yes,1-No
+helo_name=Hostname to use in <tt>SMTP HELO</tt> line,3,Same as system hostname
 
 line1=System configuration,11
 mail_system=Mail server installed,4,1-Sendmail,0-Postfix,2-Qmail,4-Qmail+LDAP,5-Qmail+VPopMail,6-Exim,3-Detect automatically
 send_mode=Send mail using,10,-Mail server program,SMTP server
-no_crlf=Add carriage return ( \r ) to each line?,1,0-Yes,1-No
+no_crlf=Add carriage return <tt>\r</tt> to each line?,1,0-Yes,1-No
 smtp_user=SMTP login name for mail server,3,None
 smtp_pass=SMTP password for mail server,3,None
 smtp_auth=SMTP authentication method,4,-Default,Cram-MD5-Cram&#45;MD5,Digest-MD5-Digest&#45;MD5,Plain-Plain,Login-Login
 auto=Detect location of mail files automatically?,1,1-Yes&#44; based on mail server,0-No&#44; use settings below ..
 mail_dir=User mail file directory,3,None
-mail_style=Mail file directory style,4,0-mail/username,1-mail/u/username,2-mail/u/us/username,3-mail/u/s/username
+mail_style=Mail file directory style,4,0-<tt>mail/username</tt>,1-<tt>mail/u/username</tt>,2-<tt>mail/u/us/username</tt>,3-<tt>mail/u/s/username</tt>
 mail_file=Mail file in user home directories,3,None
 mail_sub=Mail directory in user home directories,3,None
 mail_usermin=Folders subdirectory under home directory,3,None