diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.16.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings
--- e-smith-email-4.16.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings	2007-01-14 20:20:11.000000000 -0700
+++ mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings	2007-01-14 20:18:51.000000000 -0700
@@ -260,22 +260,9 @@
         <trans>E-mail to unknown users</trans>
     </entry>
     <entry>
-        <base>LABEL_ADDRESS</base>
-        <trans>Forwarding address for administrative notices</trans>
-    </entry>
-    <entry>
-        <base>DESC_ADDRESS</base>
-        <trans><![CDATA[
-            Administrative notices generated by the server are normally
-            e-mailed to the <B>admin</B> account. If you would like them to be
-            e-mailed elsewhere, please enter the e-mail address below.
-            Otherwise, leave this field blank.
-            ]]>
-        </trans>
-    </entry>
-    <entry>
         <base>DESC_UNKNOWN</base>
         <trans><![CDATA[
+            <h2>Unknown Users</h2>
             Selecting Reject (recommended setting) will configure the server to only
             accept mail for valid email addresses (for example users, groups, pseudonyms).
             Mail for other addresses will be rejected.
@@ -289,7 +276,8 @@
 
     <entry>
         <base>DESC_SMARTHOST</base>
-        <trans>
+        <trans><![CDATA[
+            <hr class="sectionbar" /><h2>SMTP server</h2>
             The server can deliver outgoing messages directly to their
             destination (recommended in most cases) or can deliver them via
             your Internet provider's SMTP server (recommended if you have an
@@ -297,6 +285,7 @@
             service). If using your Internet provider's SMTP server, specify
             its hostname or IP address below. Otherwise leave this field
             blank.
+            ]]>
         </trans>
     </entry>
 
diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.16.0/root/etc/e-smith/web/functions/emailsettings mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/web/functions/emailsettings
--- e-smith-email-4.16.0/root/etc/e-smith/web/functions/emailsettings	2006-03-14 12:23:58.000000000 -0700
+++ mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/web/functions/emailsettings	2007-01-14 20:16:29.000000000 -0700
@@ -252,18 +252,11 @@
         </field>
 
         <field
-            type="literal"
-            id="state_AdminEmail"
-            value="get_admin_email()">
-            <label>LABEL_ADDRESS</label>
-            <description>DESC_SECTIONBAR</description>
-        </field>
-
-        <field
             type="literal" 
             id="state_EmailUnknownUser" 
             value="get_emailunknownuser_status('localise')">
             <label>LABEL_UNKNOWN</label>
+            <description>DESC_SECTIONBAR</description>
         </field>
     
         <field 
@@ -464,15 +457,6 @@
         pre-event="turn_off_buttons"
         post-event="change_settings_delivery()">
         <field
-            type="text"
-            id="AdminEmail"
-            validation="validate_admin_email()"
-            value="get_admin_email()">
-            <label>LABEL_ADDRESS</label>
-            <description>DESC_ADDRESS</description>
-        </field>
-
-        <field
             type="select" 
             id="EmailUnknownUser" 
             options="get_emailunknownuser_options()"
diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm mezzanine_patched_e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm
--- e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm	2006-03-14 12:23:58.000000000 -0700
+++ mezzanine_patched_e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm	2007-01-14 20:19:55.000000000 -0700
@@ -22,7 +22,7 @@
   blank_or_ip_number
   get_current_webmail_status validate_smarthost getExtraParams
   get_current_pop3_access get_current_imap_access get_current_smtp_auth
-  get_prop get_value validate_admin_email get_admin_email
+  get_prop get_value
 );
 
 our $VERSION = sprintf '%d.%03d', q$Revision: 1.16 $ =~ /: (\d+).(\d+)/;
@@ -627,44 +627,6 @@
     
 }
 
-=head2 validate_admin_email
-
-This method validates the admin email address.
-
-=cut
-
-sub validate_admin_email
-{
-    my $self = shift;
-    my $q = $self->{cgi};
-
-    my $admin_email = $q->param('AdminEmail') || '';
-    $admin_email =~ s/^\s+|\s+$//g;
-
-    my $response = $self->email_simple($admin_email);
-    if (($response eq 'OK') or ($admin_email eq ''))
-    {
-        return 'OK';
-    }
-    else
-    {
-        return 'UNACCEPTABLE_CHARS';
-    }
-}
-
-=head2 get_admin_email
-
-=cut
-
-sub get_admin_email
-{
-    my $self = shift;
-    my $accounts = esmith::AccountsDB->open_ro();
-    my $admin = $accounts->get('admin');
-    return ($admin->prop('EmailForward') eq 'forward') ?
-	$admin->prop('ForwardAddress') : '';
-}
-
 =pod
 
 =head2 getExtraParams