--- smeserver-mailsorting-1.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-mailsort.add2general	2008-04-27 19:18:45.000000000 +0200
+++ smeserver-mailsorting-1.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-mailsort	2008-04-27 19:24:57.000000000 +0200
@@ -19,14 +19,6 @@
       </trans>
     </entry>
     <entry>
-      <base>LABEL_USER</base>
-      <trans>Account</trans>
-    </entry>
-    <entry>
-      <base>LABEL_FULLNAME</base>
-      <trans>User Name</trans>
-    </entry>
-    <entry>
       <base>ADD_RULE</base>
       <trans>
             <![CDATA[
@@ -48,10 +40,6 @@
       <trans>Error updateing</trans>
     </entry>
     <entry>
-      <base>SUCCESS</base>
-      <trans>Success</trans>
-    </entry>
-    <entry>
       <base>CREATE_RULE_DESCRIPTION</base>
       <trans>   Select the part of the email to be tested. You can match against
              part of an email address, header, subject, or the email size.
@@ -101,18 +89,10 @@
       <trans>Fwd</trans>
     </entry>
     <entry>
-      <base>DESTINATION</base>
-      <trans>Destination</trans>
-    </entry>
-    <entry>
       <base>COPY</base>
       <trans>Copy</trans>
     </entry>
     <entry>
-      <base>ACTION</base>
-      <trans>Action</trans>
-    </entry>
-    <entry>
       <base>2ND_ACTION</base>
       <trans>2nd Action</trans>
     </entry>
--- smeserver-mailsorting-1.2/root/etc/e-smith/web/functions/userpanel-mailsort.add2general	2006-10-26 13:40:13.000000000 +0200
+++ smeserver-mailsorting-1.2/root/etc/e-smith/web/functions/userpanel-mailsort	2008-04-27 19:22:03.000000000 +0200
@@ -38,11 +38,11 @@
         <subroutine src="user_status" />
 
         <field type="literal" id="User" value="get_panel_user()">
-            <label>LABEL_USER</label>
+            <label>ACCOUNT</label>
         </field>
 
         <field type="literal" id="FullName" value="get_full_name()">
-            <label>LABEL_FULLNAME</label>
+            <label>USER_NAME</label>
         </field>
 
         <field