diff -Nur --no-dereference smeserver-fetchmail-1.6.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.6/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.6.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail	2021-11-17 14:18:15.236000000 -0500
+++ smeserver-fetchmail-1.6/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail	2021-11-17 14:22:44.155000000 -0500
@@ -459,4 +459,18 @@
         ]]>
         </trans>
     </entry>
+        <entry>
+            <base>SET_FETCHMAIL_SATUS</base>
+            <trans>Confirm you want to change Fetchmail status</trans>
+        </entry>
+        <entry>
+            <base>RoutingIMPAPPOP</base>
+            <trans>Confirm you want to change IMAP and POP external traffic filtering status</trans>
+        </entry>
+
+        <entry>
+            <base>RoutingNNTP</base>
+            <trans>Confirm you want to change NNTP external traffic filtering status</trans>
+        </entry>
+
 </lexicon>
diff -Nur --no-dereference smeserver-fetchmail-1.6.old/root/etc/e-smith/templates/etc/rc.d/init.d/masq/35transproxy-fetchmail smeserver-fetchmail-1.6/root/etc/e-smith/templates/etc/rc.d/init.d/masq/35transproxy-fetchmail
--- smeserver-fetchmail-1.6.old/root/etc/e-smith/templates/etc/rc.d/init.d/masq/35transproxy-fetchmail	2021-11-17 14:18:15.224000000 -0500
+++ smeserver-fetchmail-1.6/root/etc/e-smith/templates/etc/rc.d/init.d/masq/35transproxy-fetchmail	2021-11-17 14:19:49.527000000 -0500
@@ -24,19 +24,6 @@
         $OUT .= "\t-i \$INTERNALIF -p tcp ! --dst \$LOCALIP --dport 143 --jump DROP\n";
 
     }
-    my $routingSMTP = $FetchMails{ "RoutingSMTP" } || "YES" ;
-    if ( $routingSMTP eq "NO" ) {
-
-        # Users on LAN are not allowed to access to SMTP
-        # servers on Internet.
-
-        $OUT .= "    /sbin/iptables --append FORWARD\\\n";
-        $OUT .= "\t-i \$INTERNALIF -p tcp ! --dst \$LOCALIP --dport 25\\\n";
-        $OUT .= "\t--jump LOG --log-prefix \"denylogfetchmail: \"\n";
-        $OUT .= "    /sbin/iptables --append FORWARD\\\n";
-        $OUT .= "\t-i \$INTERNALIF -p tcp ! --dst \$LOCALIP --dport 25 --jump DROP\n";
-
-    }
     my $routingNNTP = $FetchMails{ "RoutingNNTP" } || "YES" ;
     if ( $routingNNTP eq "NO" ) {
 
diff -Nur --no-dereference smeserver-fetchmail-1.6.old/root/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.6/root/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.6.old/root/etc/e-smith/web/functions/fetchmail	2021-11-17 14:18:15.246000000 -0500
+++ smeserver-fetchmail-1.6/root/etc/e-smith/web/functions/fetchmail	2021-11-17 14:19:49.021000000 -0500
@@ -182,8 +182,9 @@
          to the front page.
     -->
     <page
-        name="Service1"
+        name="FetchmailStatus"
         post-event="fetchmail_enable_disable">
+        <title>SET_FETCHMAIL_SATUS</title>
     </page>
 
     <!-- page 6 
@@ -191,8 +192,9 @@
          to the front page.
     -->
     <page
-        name="Service2"
+        name="Routing"
         post-event="fetchmail_routing">
+        <title>RoutingIMPAPPOP</title>
     </page>
 
     <!-- page 7 
@@ -200,8 +202,9 @@
          to the front page.
     -->
     <page
-        name="Service3"
+        name="RoutingSMTP"
         post-event="fetchmail_routingSMTP">
+        <title>RoutingSMTP</title>
     </page>
 
     <!-- page 8 
@@ -209,8 +212,9 @@
          to the front page.
     -->
     <page
-        name="Service4"
+        name="RoutingNNTP"
         post-event="fetchmail_routingNNTP">
+        <title>RoutingNNTP</title>
     </page>
 
     <!-- page 9 
@@ -218,8 +222,14 @@
          to the front page.
     -->
     <page
-        name="Service5"
+        name="SMTPProxy"
         post-event="fetchmail_SMTPProxy">
     </page>
+    <!-- keep this one so next button display on previous one 
+    -->
+    <page
+        name="Dummy">
+    </page>
+
 
 </form>
diff -Nur --no-dereference smeserver-fetchmail-1.6.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/fetchmail.pm smeserver-fetchmail-1.6/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/fetchmail.pm
--- smeserver-fetchmail-1.6.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/fetchmail.pm	2021-11-17 14:18:15.271000000 -0500
+++ smeserver-fetchmail-1.6/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/fetchmail.pm	2021-11-17 14:19:49.279000000 -0500
@@ -78,7 +78,7 @@
     my $self = esmith::FormMagick->new();
     bless $self, $class;
     # Uncomment the following line for debugging.
-    #$self->debug(TRUE);
+    # $self->debug(TRUE);
     return $self;
 }
 
@@ -177,12 +177,14 @@
 
     my $FM = $db->get('FetchMails')
         or ($self->error('ERR_NO_FETCHMAIL_RECORD') and return undef) ;
+    my $QP = $db->get('qpsmtpd')
+        or ($self->error('ERR_NO_QPSMTPD_RECORD') and return undef) ;
     my $FMStatus = 0 ;
     $FMStatus = 1 if ( ( $FM->prop('status') || 'disabled' ) eq 'enabled' ) ;
     my $FMRouting = 0 ;
     $FMRouting = 1 if ( ( $FM->prop('Routing') || 'NO' ) eq 'YES' ) ;
     my $FMRoutingSMTP = 0 ;
-    $FMRoutingSMTP = 1 if ( ( $FM->prop('RoutingSMTP') || 'NO' ) eq 'YES' ) ;
+    $FMRoutingSMTP = 1 if ( ( $QP->prop('Proxy') || 'disabled' ) eq 'disabled' ) ;
     my $FMRoutingNNTP = 0 ;
     $FMRoutingNNTP = 1 if ( ( $FM->prop('RoutingNNTP') || 'NO' ) eq 'YES' ) ;
     # we need also information about smtpfront-qmail
@@ -197,7 +199,7 @@
     my $SmtpProxy = $db->get($MailSystem) 
         or ($self->error('ERR_NO_SMTPFRONT-QMAIL_RECORD') and return undef) ;
     my $FMRoutingSMTPProxy = 0 ;
-    $FMRoutingSMTPProxy = 1 if ( ( $SmtpProxy->prop('Proxy') || 'disabled' ) eq 'enabled' ) ;
+    $FMRoutingSMTPProxy = 1 if ( ( $SmtpProxy->prop('Proxy') || 'disabled' ) eq 'transparent' ) ;
     print $q->start_table({-class => 'sme-noborder'}), "\n";
     print $q->Tr(
         esmith::cgi::genCell( $q,
@@ -206,7 +208,7 @@
         esmith::cgi::genCell( $q,
             $self->localise('SERVICE_' . $FMStatus) , "sme-noborders-label" ),
         esmith::cgi::genCell( $q, "<a class=\"button-like\""
-            . "href=\"fetchmail?page=5&Next=First&Current=" . $FMStatus . "\">"
+            . "href=\"fetchmail?page=0&wherenext=FetchmailStatus&Next=First&Current=" . $FMStatus . "\">"
             . $self->localise('BUTTON_LABEL_SERVICE_' . $FMStatus )
             . "</a>", "sme-noborders-content" ),"\n",
     ),"\n" ;
@@ -218,7 +220,7 @@
             $self->localise('ROUTING_' . $FMRouting) , "sme-noborders-label" ),
         esmith::cgi::genCell( $q,
             "<a class=\"button-like\""
-            . "href=\"fetchmail?page=6&Next=First&CurrentPOP=" . $FMRouting . "\">"
+            . "href=\"fetchmail?page=0&wherenext=Routing&Next=First&CurrentPOP=" . $FMRouting . "\">"
             . $self->localise('BUTTON_LABEL_ROUTING_' . $FMRouting)
             . "</a>" , "sme-noborders-content" ),"\n",
     ),"\n" ;
@@ -230,7 +232,7 @@
             $self->localise('ROUTINGNNTP_' . $FMRoutingNNTP) , "sme-noborders-label" ),
         esmith::cgi::genCell( $q,
             "<a class=\"button-like\""
-            . "href=\"fetchmail?page=8&Next=First&CurrentNNTP=" . $FMRoutingNNTP . "\">"
+            . "href=\"fetchmail?page=0&wherenext=RoutingNNTP&Next=First&CurrentNNTP=" . $FMRoutingNNTP . "\">"
             . $self->localise('BUTTON_LABEL_ROUTINGNNTP_' . $FMRoutingNNTP)
             . "</a>" , "sme-noborders-content" ),"\n",
     ),"\n" ;
@@ -242,8 +244,8 @@
             $self->localise('ROUTINGSMTP_' . $FMRoutingSMTP) , "sme-noborders-label" ),
         esmith::cgi::genCell( $q,
             "<a class=\"button-like\""
-            . "href=\"fetchmail?page=7&Next=First&CurrentSMTP=" . $FMRoutingSMTP . "\">"
-            . $self->localise('BUTTON_LABEL_ROUTINGSMTP_' . $FMRoutingSMTP)
+            . "href=\"proxy\">"
+            . $self->localise('MODIFY')
             . "</a>" , "sme-noborders-content" ),"\n",
     ),"\n" ;
     print $q->Tr(
@@ -254,10 +256,10 @@
             $self->localise('ROUTINGSMTPPROXY_' . $FMRoutingSMTPProxy) , "sme-noborders-label" ),
         esmith::cgi::genCell( $q,
             "<a class=\"button-like\""
-            . "href=\"fetchmail?page=9&Next=First&CurrentSMTPProxy=" . $FMRoutingSMTPProxy . "\">"
-            . $self->localise('BUTTON_LABEL_ROUTINGSMTPPROXY_' . $FMRoutingSMTPProxy)
+            . "href=\"proxy\">"
+            . $self->localise('MODIFY')
             . "</a>" , "sme-noborders-content" ),"\n",
-    ),"\n" ;
+    ),"\n" unless  $SmtpProxy->prop('Proxy') eq "blocked" ;
     print $q->end_table(),"\n";
     return undef ;
 }
@@ -561,11 +563,12 @@
 sub fetchmail_enable_disable {
     my $self = shift ;
     $self->debug_msg("Start of sub 'fetchmail_enable_disable'.") ;
-    my $current = $self->{cgi}->param('Current') ;
-    $self->debug_msg("'fetchmail_enable_disable' : \$current = $current") ;
+    #my $current = $self->{cgi}->param('Current') ;
+    #$self->debug_msg("'fetchmail_enable_disable' : \$current = $current") ;
     my $FM = $db->get('FetchMails') 
         || ($self->error('ERR_NO_FETCHMAIL_RECORD') and return undef);
-    if ( $current ) {
+    my $current = $FM->prop("status") || "disabled";
+    if ( $current eq "enabled" ) {
         $FM->set_prop("status", "disabled") ;
         $self->debug_msg("'fetchmail_enable_disable' : fetchmail disabled.") ;
     } else {
@@ -850,10 +853,12 @@
 =head2 fetchmail_routingSMTP
 
 This method change the 'SMTP routing' mode of Fetchmail
+to be removed, not used anymore on SME 10
 
 =cut
 
 sub fetchmail_routingSMTP {
+    return undef ;
     my $self = shift ;
     $self->debug_msg("Start of sub 'fetchmail_routingSMTP'.") ;
     my $current = $self->{cgi}->param('CurrentSMTP') ;
@@ -880,10 +885,12 @@
 =head2 fetchmail_SMTPProxy
 
 This method change the state of the SME SMTP Proxy
+to be removed, not used anymore on SME 10
 
 =cut
 
 sub fetchmail_SMTPProxy {
+    return undef ;
     my $self = shift ;
     $self->debug_msg("Start of sub 'fetchmail_SMTPProxy'.") ;
     my $current = $self->{cgi}->param('CurrentSMTPProxy') ;