diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index ce9a0c911e..37943971a1 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -88,7 +88,8 @@ include('options-head.php');
 				User must fill out name and email </label> 
 			</li> 
 		</ul> 
-		<h3>Comment Moderation:</h3>
+<fieldset class="options">
+		<legend>Comment Moderation</legend>
 		<p>Hold a comment in the queue if it contains more than 
 			<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="<?php echo get_settings('comment_max_links'); ?>" /> 
 		links. (A common characteristic of comment spam is a large number of hyperlinks.)</p>
@@ -96,6 +97,7 @@ include('options-head.php');
 		<p> 
 			<textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%;"><?php echo get_settings('moderation_keys'); ?></textarea> 
 		</p> 
+</fieldset>
 		<p style="text-align: right;"> 
 			<input type="submit" name="Submit" value="Update Options" /> 
 		</p> 
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index af3c10a48a..579ff9822a 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -44,7 +44,7 @@ include('options-head.php');
   <h2>General Options</h2> 
   <form name="form1" method="post" action="options.php"> 
     <input type="hidden" name="action" value="update" /> 
-	<input type="hidden" name="action" value="update" /> <input type="hidden" name="page_options" value="'blogname','blogdescription','siteurl','admin_email','users_can_register','new_users_can_blog','gmt_offset'" /> 
+	<input type="hidden" name="action" value="update" /> <input type="hidden" name="page_options" value="'blogname','blogdescription','siteurl','admin_email','users_can_register','new_users_can_blog','gmt_offset','date_format','time_format'" /> 
     <table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
       <tr valign="top"> 
         <th width="33%" scope="row">Weblog title: </th> 
@@ -78,7 +78,7 @@ This address is used only for admin purposes. </td>
       </tr> 
     </table> 
     <fieldset class="options"> 
-    <legend>Time</legend> 
+    <legend>Date and Time</legend> 
 	    <table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
       <tr> 
         <th scope="row" width="33%"><acronym title="Greenwich Meridian Time">GMT</acronym> time is: </th> 
@@ -88,7 +88,19 @@ This address is used only for admin purposes. </td>
         <th scope="row">Times in the weblog should differ by: </th>
         <td><input name="gmt_offset" type="text" id="gmt_offset" size="2" value="<?php echo get_settings('gmt_offset'); ?>" /> 
         hours </td>
-      </tr> 
+      </tr>
+      <tr>
+      	<th scope="row">&nbsp;</th>
+      	<td>The following use the same syntax as the <a href="http://php.net/date">PHP <code>date()</code> function</a>. </td>
+      	</tr>
+      <tr>
+      	<th scope="row">Default date format:</th>
+      	<td><input name="date_format" type="text" id="date_format" size="30" value="<?php echo get_settings('date_format'); ?>" /></td>
+      	</tr>
+      <tr>
+      	<th scope="row">Default time format:</th>
+      	<td><input name="time_format" type="text" id="time_format" size="30" value="<?php echo get_settings('time_format'); ?>" /></td>
+      	</tr> 
 </table>
     </fieldset> 
     <p style="text-align: right;">
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 490788d91e..27f313edf9 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -44,7 +44,7 @@ include('options-head.php');
 	<form name="form1" method="post" action="options.php"> 
 		<input type="hidden" name="action" value="update" /> 
 		<input type="hidden" name="page_options" value="'posts_per_page','what_to_show','rss_use_excerpt','blog_charset','gzipcompression' " /> 
-		<fieldset> 
+		<fieldset class="options"> 
 		<legend>Front Page</legend> 
 		<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
 			<tr valign="top"> 
@@ -59,7 +59,7 @@ include('options-head.php');
 		</table> 
 		</fieldset> 
 
-		<fieldset> 
+		<fieldset class="options"> 
 		<legend>Syndication Feeds</legend> 
 		<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
 			<tr valign="top"> 
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 358b2144a4..53526a396e 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -1,5 +1,5 @@
 <?php
-$title = 'Reading Options';
+$title = 'Writing Options';
 
 function add_magic_quotes($array) {
 	foreach ($array as $k => $v) {
@@ -73,12 +73,40 @@ Advanced controls</label>
   WordPress should correct invalidly nested XHTML automatically</label></td>
       </tr>
     </table> 
-    <fieldset>
+    <fieldset class="options">
 	<legend>Update Services</legend>
-	<p>Enter the sites that you would like to notify when you publish a new post. For a list of some recommended sites to ping please see [LINK TO SOMETHING]. Seperate multiple URIs by line breaks.</p>
+	<p>Enter the sites that you would like to notify when you publish a new post. For a list of some recommended sites to ping please see <a href="http://wiki.wordpress.org/index.php/UpdateServices">Update Services</a> on the wiki. Seperate multiple URIs by line breaks.</p>
 	
 	<textarea name="ping_sites" id="ping_sites" style="width: 98%;"><?php echo get_settings('ping_sites'); ?></textarea>
 	</fieldset>
+    <fieldset class="options">
+	<legend>Writing by Email</legend>
+	<p>To post to WordPress by email you must set up a secret email account with POP3 access. Any mail received at this address will be posted, so it's a good idea to keep this address very secret. Here are three random strings you could use: <code><?php echo substr(md5(uniqid(microtime())),0,5); ?></code>, <code><?php echo substr(md5(uniqid(microtime())),0,5); ?></code>, <code><?php echo substr(md5(uniqid(microtime())),0,5); ?></code>.</p>
+	
+		<table width="100%" cellspacing="2" cellpadding="5" class="editform">
+        	<tr valign="top">
+        		<th scope="row"> Mail server:</th>
+        		<td><input name="mailserver_url" type="text" id="mailserver_url" value="<?php echo get_settings('mailserver_url'); ?>" size="40" />
+       			<label for="port">Port:</label> 
+				<input name="mailserver_port" type="text" id="mailserver_port" value="<?php echo get_settings('mailserver_port'); ?>" size="6" />
+       			</td>
+       		</tr>
+        	<tr valign="top">
+        		<th width="33%" scope="row"> Login name:</th>
+        		<td><input name="mailserver_login" type="text" id="mailserver_login" value="<?php echo get_settings('mailserver_login'); ?>" size="40" /></td>
+       		</tr>
+        	<tr valign="top">
+        		<th scope="row">Password:</th>
+        		<td>
+        			<input name="mailserver_pass" type="text" id="mailserver_pass" value="<?php echo get_settings('mailserver_pass'); ?>" size="40" />
+        		</td>
+       		</tr>
+        	<tr valign="top">
+        		<th scope="row">Usual category:</th>
+        		<td>&nbsp;</td>
+       		</tr>
+        	</table>
+		</fieldset>
     <p style="text-align: right;"> 
       <input type="submit" name="Submit" value="Update Options" /> 
     </p> 
diff --git a/wp-admin/options.php b/wp-admin/options.php
index 18bd2f0418..edfcf0c768 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -34,8 +34,8 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
 		}
 	}
 }
-
-require_once("optionhandler.php");
+$option_group_id = (int) $_GET['option_group_id'];
+require_once('./optionhandler.php');
 $non_was_selected = 0;
 if ($option_group_id == '') {
     $option_group_id = 1;
@@ -46,7 +46,7 @@ switch($action) {
 
 case 'update':
 	$standalone = 1;
-	include_once("./admin-header.php");
+	include_once('./admin-header.php');
     $any_changed = 0;
     
     // iterate through the list of options in this group
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 73dd8095a2..23983e3bc2 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -50,6 +50,14 @@ fieldset {
 	padding: 2px;
 }
 
+fieldset.options {
+	padding: 1em;
+}
+
+fieldset.options legend {
+	font-size: 16px;
+}
+
 fieldset label.selectit {
 	background: #f0f0f0;
 	display: block;
@@ -177,7 +185,7 @@ textarea, input, select {
 }
 
 .wrap h2 {
-	font-size: 18px;
+	font-size: 20px;
 	margin: 6px 0;
 }