From d3c893575fc6e39a7e6399e3457d3abc03a893b4 Mon Sep 17 00:00:00 2001
From: philippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sat, 24 Nov 2001 09:04:05 +0000
Subject: [PATCH] mail_fetch adaptation

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1796 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 plugins/mail_fetch/class.POP3.php |  38 ++--
 plugins/mail_fetch/fetch.php      |  50 +++--
 plugins/mail_fetch/functions.php  |  22 +-
 plugins/mail_fetch/options.php    | 359 +++++++++++++++++-------------
 plugins/mail_fetch/setup.php      |  96 ++------
 po/squirrelmail.po                | 329 +++++++++++++--------------
 6 files changed, 459 insertions(+), 435 deletions(-)

diff --git a/plugins/mail_fetch/class.POP3.php b/plugins/mail_fetch/class.POP3.php
index ba8cd77b..dec5a0bf 100644
--- a/plugins/mail_fetch/class.POP3.php
+++ b/plugins/mail_fetch/class.POP3.php
@@ -1,14 +1,22 @@
 <?
 
-/*
-    class.POP3.php3 v1.0    99/03/24 CDI cdi@thewebmasters.net
-    Copyright (c) 1999 - CDI (cdi@thewebmasters.net) All Rights Reserved
-    Modified by Philippe Mingo 2001 mingo@rotedic.com
-    An RFC 1939 compliant wrapper class for the POP3 protocol.
-*/
+   /**
+    **  mail_fetch/setup.php
+    **
+    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
+    **  Licensed under the GNU GPL. For full terms see the file COPYING.
+    **
+    **  Copyright (c) 1999 - CDI (cdi@thewebmasters.net) All Rights Reserved
+    **  Modified by Philippe Mingo 2001 mingo@rotedic.com
+    **  An RFC 1939 compliant wrapper class for the POP3 protocol.
+    **
+    **  pop3 class
+    **
+    **  $Id$
+    **/
 
 class POP3 {
-    var $ERROR      = "";       //  Error string.
+    var $ERROR      = '';       //  Error string.
 
     var $TIMEOUT    = 60;       //  Default timeout before giving up on a
                                 //  network operation.
@@ -19,26 +27,26 @@ class POP3 {
                                 //  Per RFC 1939 the returned line a POP3
                                 //  server can send is 512 bytes.
 
-    var $FP         = "";       //  The connection to the server's
+    var $FP         = '';       //  The connection to the server's
                                 //  file descriptor
 
-    var $MAILSERVER = "";       // Set this to hard code the server name
+    var $MAILSERVER = '';       // Set this to hard code the server name
 
-    var $DEBUG      = false;    // set to true to echo pop3
+    var $DEBUG      = FASLE;    // set to true to echo pop3
                                 // commands and responses to error_log
                                 // this WILL log passwords!
 
-    var $BANNER     = "";       //  Holds the banner returned by the
+    var $BANNER     = '';       //  Holds the banner returned by the
                                 //  pop server - used for apop()
 
-    var $RFC1939    = true;     //  Set by noop(). See rfc1939.txt
+    var $RFC1939    = TRUE;     //  Set by noop(). See rfc1939.txt
                                 //
 
-    var $ALLOWAPOP  = false;    //  Allow or disallow apop()
+    var $ALLOWAPOP  = FASLE;    //  Allow or disallow apop()
                                 //  This must be set to true
                                 //  manually
 
-    function POP3 ( $server = "", $timeout = "" ) {
+    function POP3 ( $server = '', $timeout = '' ) {
         settype($this->BUFFER,"integer");
         if( !empty($server) ) {
             // Do not allow programs to alter MAILSERVER
@@ -583,7 +591,7 @@ class POP3 {
                 }
                 else
                 {
-                    $UIDLArray[$count] = "deleted";
+                    $UIDLArray[$count] = 'deleted';
                 }
                 $count++;
                 $line = fgets($fp,$buffer);
diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index 400707a6..9e43902d 100644
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -1,25 +1,33 @@
 <?php
-   /*
-    *  Mail Fetch
-    *
-    */
 
-   chdir('..');
-   require_once('../src/validate.php');
-   require_once('../functions/page_header.php');
-   require_once('../functions/imap.php');
-   require_once('../src/load_prefs.php');
-   require_once('../plugins/mail_fetch/class.POP3.php');
-   require_once('../functions/i18n.php');
-   require_once( '../plugins/mail_fetch/functions.php' );
+   /**
+    **  mail_fetch/fetch.php
+    **
+    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
+    **  Licensed under the GNU GPL. For full terms see the file COPYING.
+    **
+    **  Fetch code.
+    **
+    **  $Id$
+    **/
+
+    chdir('..');
+    require_once('../src/validate.php');
+    require_once('../functions/page_header.php');
+    require_once('../functions/imap.php');
+    require_once('../src/load_prefs.php');
+    require_once('../plugins/mail_fetch/class.POP3.php');
+    require_once('../functions/i18n.php');
+    require_once( '../plugins/mail_fetch/functions.php' );
+
+
+    function Mail_Fetch_Status($msg) {
+        echo '<table width=90%><tr><td>' .
+            htmlspecialchars( $msg ) .
+            '</td></tr></table>';
+        flush();
+    }
 
-    
-function Mail_Fetch_Status($msg) {
-    echo '<table width=90%><tr><td>' . 
-         htmlspecialchars( $msg ) . 
-         '</td></tr></table>';
-    flush();
-}
     displayPageHeader($color, 'None');
 
     $mailfetch_server_number = getPref($data_dir, $username, "mailfetch_server_number");
@@ -119,11 +127,11 @@ function Mail_Fetch_Status($msg) {
         
         Mail_Fetch_Status(_("Opening IMAP server"));
         $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10);
-        
+        echo $mailfetch_user . ' ' . $mailfetch_pass . ' ';
         Mail_Fetch_Status(_("Opening POP server"));
         $Count = $pop3->login($mailfetch_user, $mailfetch_pass);
         if (($Count == false || $Count == -1) && $pop3->ERROR != '') {
-            Mail_Fetch_Status(_("Login Failed:") . $pop3->ERROR );
+            Mail_Fetch_Status(_("Login Failed:") . ' ' . $pop3->ERROR );
             continue;
         }
         
diff --git a/plugins/mail_fetch/functions.php b/plugins/mail_fetch/functions.php
index c426e278..84dadc96 100644
--- a/plugins/mail_fetch/functions.php
+++ b/plugins/mail_fetch/functions.php
@@ -1,13 +1,19 @@
 <?php
 
-/*
- *
- * Original code from LexZEUS <lexzeus@mifinca.com>
- * and josh@superfork.com (extracted from php manual)
- * Adapted for MailFetch by Philippe Mingo <mingo@rotedic.com>
- *
- */
-
+   /**
+    **  mail_fetch/functions.php
+    **
+    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
+    **  Licensed under the GNU GPL. For full terms see the file COPYING.
+    **
+    **  Functions for the mailfetch plugin.
+    **
+    **  Original code from LexZEUS <lexzeus@mifinca.com>
+    **  and josh@superfork.com (extracted from php manual)
+    **  Adapted for MailFetch by Philippe Mingo <mingo@rotedic.com>
+    **
+    **  $Id$
+    **/
 
     function hex2bin( $data ) {
 
diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php
index 55f0077c..73cf3bec 100644
--- a/plugins/mail_fetch/options.php
+++ b/plugins/mail_fetch/options.php
@@ -1,27 +1,92 @@
 <?php
-   /*
-    *  Mail Fetch
-    *  ==========
-    *
-    *  Original idea and code by Tyler Akins
-    *
-    *  10/07/2001 mingo@rotedic.com modified to encrypt stored passwords
-    *
-    */
+
+   /**
+    **  mail_fetch/options.php
+    **
+    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
+    **  Licensed under the GNU GPL. For full terms see the file COPYING.
+    **
+    **  Setup of the mailfetch plugin.
+    **
+    **  $Id$
+    **/
 
     chdir('..');
     require_once('../src/validate.php');
     require_once('../functions/imap.php');
     require_once('../src/load_prefs.php');
-    require_once('../functions/i18n.php');
 
-    displayPageHeader( $color, _("None") );
+    displayPageHeader( $color, 'None' );
 
-    $mailfetch_server_number = getPref($data_dir, $username, "mailfetch_server_number");
-    if (!isset($mailfetch_server_number)) $mailfetch_server_number=0;
+    //if dosen't select any option
+    if (!isset($mf_action))
+        $mf_action = 'config';
 
-    $mailfetch_cypher = getPref( $data_dir, $username, "mailfetch_cypher" );
-    if ($mailfetch_server_number<1) $mailfetch_server_number=0;
+    switch( $mf_action ) {
+    case 'add':
+        if ($mf_sn<1) $mf_sn=0;
+        if (!isset($mf_server)) return;
+        setPref($data_dir,$username,"mailfetch_server_$mf_sn", (isset($mf_server)?$mf_server:""));
+        setPref($data_dir,$username,"mailfetch_alias_$mf_sn", (isset($mf_alias)?$mf_alias:""));
+        setPref($data_dir,$username,"mailfetch_user_$mf_sn",(isset($mf_user)?$mf_user:""));
+        setPref($data_dir,$username,"mailfetch_pass_$mf_sn",(isset($mf_pass)?encrypt( $mf_pass )    :""));
+        if( $mf_cypher <> 'on' ) SetPref($data_dir,$username,"mailfetch_cypher",    'on');
+        setPref($data_dir,$username,"mailfetch_lmos_$mf_sn",(isset($mf_lmos)?$mf_lmos:""));
+        setPref($data_dir,$username,"mailfetch_login_$mf_sn",(isset($mf_login)?$mf_login:""));
+        setPref($data_dir,$username,"mailfetch_fref_$mf_sn",(isset($mf_fref)?$mf_fref:""));
+        setPref($data_dir,$username,"mailfetch_subfolder_$mf_sn",(isset($mf_subfolder)?$mf_subfolder:""));
+        $mf_sn++;
+        setPref($data_dir,$username,'mailfetch_server_number', $mf_sn);
+        $mf_action = 'config';
+        break;
+    case 'confirm_modify':
+        //modify    a server
+        if (!isset($mf_server)) return;
+        setPref($data_dir,$username,"mailfetch_server_$mf_sn", (isset($mf_server)?$mf_server:""));
+        setPref($data_dir,$username,"mailfetch_alias_$mf_sn", (isset($mf_alias)?$mf_alias:""));
+        setPref($data_dir,$username,"mailfetch_user_$mf_sn",(isset($mf_user)?$mf_user:""));
+        setPref($data_dir,$username,"mailfetch_pass_$mf_sn",(isset($mf_pass)?encrypt( $mf_pass )    :""));
+        if( $mf_cypher <> 'on' ) setPref($data_dir,$username,"mailfetch_cypher", 'on');
+        setPref($data_dir,$username,"mailfetch_lmos_$mf_sn",(isset($mf_lmos)?$mf_lmos:""));
+        setPref($data_dir,$username,"mailfetch_login_$mf_sn",(isset($mf_login)?$mf_login:""));
+        setPref($data_dir,$username,"mailfetch_fref_$mf_sn",(isset($mf_fref)?$mf_fref:""));
+        setPref($data_dir,$username,"mailfetch_subfolder_$mf_sn",(isset($mf_subfolder)?$mf_subfolder:""));
+        $mf_action = 'config';
+        break;
+    case 'confirm_delete':
+        //delete    a server
+        $mailfetch_server_number    = getPref($data_dir, $username, "mailfetch_server_number");
+        if ($mf_sn+1==$mailfetch_server_number) {
+            //is the last server, whe can only decrase $mailfetch_server_number
+            $mailfetch_server_number--;
+            setPref($data_dir,$username,"mailfetch_server_number", $mailfetch_server_number);
+        } else {
+            //if not the last, all the sequel server come up one step
+            //then whe decrase $mailfetch_server_number
+            $mailfetch_server_number--;
+            for ($i=$mf_sn;$i<$mailfetch_server_number;$i++) {
+                $tmp=$i+1;
+                setPref($data_dir,$username,"mailfetch_server_$mf_sn", getPref($data_dir, $username, "mailfetch_server_$tmp"));
+                setPref($data_dir,$username,"mailfetch_alias_$mf_sn", getPref($data_dir, $username, "mailfetch_alias_$tmp"));
+                setPref($data_dir,$username,"mailfetch_user_$mf_sn", getPref($data_dir, $username, "mailfetch_user_$tmp"));
+                setPref($data_dir,$username,"mailfetch_pass_$mf_sn",(isset($mf_pass)?encrypt( $mf_pass ) :""));
+                // if( $mf_cypher <> 'on' ) setPref($data_dir,$username,"mailfetch_cypher", 'on');
+                setPref($data_dir,$username,"mailfetch_lmos_$mf_sn", getPref($data_dir, $username, "mailfetch_lmos_$tmp"));
+                setPref($data_dir,$username,"mailfetch_login_$mf_sn", getPref($data_dir, $username, "mailfetch_login_$tmp"));
+                setPref($data_dir,$username,"mailfetch_fref_$mf_sn", getPref($data_dir, $username, "mailfetch_fref_$tmp"));
+                setPref($data_dir,$username,"mailfetch_subfolder_$mf_sn", getPref($data_dir, $username, "mailfetch_subfolder_$tmp"));
+            }
+            setPref($data_dir,$username,"mailfetch_server_number", $mailfetch_server_number);
+        }
+        $mf_action = 'config';
+        break;
+    }
+
+    $mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number', 0);
+    $mailfetch_cypher = getPref( $data_dir, $username, 'mailfetch_cypher' );
+    if ($mailfetch_server_number<1) {
+        $mailfetch_server_number=0;
+    }
     for ($i=0;$i<$mailfetch_server_number;$i++) {
         $mailfetch_server_[$i] = getPref($data_dir, $username, "mailfetch_server_$i");
         $mailfetch_alias_[$i] = getPref($data_dir, $username, "mailfetch_alias_$i");
@@ -36,7 +101,7 @@
     }
 
 
-    echo '<BR><form method=post action="../../src/options.php">' .
+    echo '<BR><form method=post action="'.$PHP_SELF.'">' .
             "<TABLE WIDTH=95% COLS=1 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>" . _("Remote POP server settings") . '</b></TD></TR></TABLE>' .
             '<TABLE WIDTH=95% COLS=1 ALIGN=CENTER><TR><TD>' .
             _("You should be aware that the encryption used to store your password is not perfectly secure.  However, if you are using pop, there is inherently no encryption anyway. Additionally, the encryption that we do to save it on the server can be undone by a hacker reading the source to this file." ) .
@@ -48,150 +113,140 @@
             _("Encrypt passwords (informative only)") . ' </td><tr>' .
             '</TABLE></td></tr>';
 
-    //if dosen't select any option
-    if (!isset($mf_action)) {
-
-            echo '<TABLE WIDTH=70% COLS=1 ALIGN=CENTER>' .
-                "  <TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><b>" . _("Add Server") . '</b></TD></TR>' .
-                "  <TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>" .
-                "<INPUT TYPE=\"hidden\" NAME=\"mf_sn\" VALUE=\"$mailfetch_server_number\">" .
-                '<INPUT TYPE="hidden" NAME="mf_action" VALUE="add"><table>' .
-                '<tr><th align=right>' . _("Server:") . '</th><td><input type=text name=mf_server value="" size=40></td></tr>' .
-                '<tr><th align=right>' . _("Alias:") . '</th><td><input type=text name=mf_alias value="" size=20></td></tr>' .
-                '<tr><th align=right>' . _("Username:") . '</th><td><input type=text name=mf_user value="" size=20></td></tr>' .
-                '<tr><th align=right>' . _("Password:") . '</th><td><input type=password name=mf_pass value="" size=20></td></tr>' .
-                '<tr><th align=right>' . _("Store in Folder:") . '</th><td>';
-            $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
-            $boxes = sqimap_mailbox_list($imapConnection);
-            echo '<SELECT NAME=mf_subfolder><OPTION SELECTED VALUE="">INBOX';
-            for ($i = 0; $i < count($boxes); $i++) {
-                if (in_array('noinferiors', $boxes[$i]['flags'])) {
-                    if ((strtolower($boxes[$i]["unformatted"]) == 'inbox') &&
-                ($default_sub_of_inbox == true)) {
-                            $box = $boxes[$i]["unformatted"];
-                            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
+    switch( $mf_action ) {
+    case 'config':
+        echo '<TABLE WIDTH=70% COLS=1 ALIGN=CENTER cellpadding=5 cellspacing=1>' .
+            "  <TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><b>" . _("Add Server") . '</b></TD></TR>' .
+            "  <TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>" .
+            "<INPUT TYPE=\"hidden\" NAME=\"mf_sn\" VALUE=\"$mailfetch_server_number\">" .
+            '<INPUT TYPE="hidden" NAME="mf_action" VALUE="add"><table>' .
+            '<tr><th align=right>' . _("Server:") . '</th><td><input type=text name=mf_server value="" size=40></td></tr>' .
+            '<tr><th align=right>' . _("Alias:") . '</th><td><input type=text name=mf_alias value="" size=20></td></tr>' .
+            '<tr><th align=right>' . _("Username:") . '</th><td><input type=text name=mf_user value="" size=20></td></tr>' .
+            '<tr><th align=right>' . _("Password:") . '</th><td><input type=password name=mf_pass value="" size=20></td></tr>' .
+            '<tr><th align=right>' . _("Store in Folder:") . '</th><td>';
+        $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
+        $boxes = sqimap_mailbox_list($imapConnection);
+        echo '<SELECT NAME=mf_subfolder><OPTION SELECTED VALUE="">INBOX';
+        for ($i = 0; $i < count($boxes); $i++) {
+            if (in_array('noinferiors', $boxes[$i]['flags'])) {
+                if ((strtolower($boxes[$i]["unformatted"]) == 'inbox') &&
+                    ($default_sub_of_inbox == true)) {
+                        $box = $boxes[$i]['unformatted'];
+                        $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
+                        echo "<OPTION VALUE=\"$box\">$box2";
+                } else {
+                        $box = $boxes[$i]['unformatted'];
+                        $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
+                        if (strtolower($imap_server_type) != 'courier' ||
+                            strtolower($box) != 'inbox.trash')
                             echo "<OPTION VALUE=\"$box\">$box2";
-                    } else {
-                            $box = $boxes[$i]["unformatted"];
-                            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
-                            if (strtolower($imap_server_type) != "courier" ||
-                                strtolower($box) != "inbox.trash")
-                                echo "<OPTION VALUE=\"$box\">$box2";
-                    }
                 }
             }
-            echo '</SELECT></td></tr>' .
-                '<tr><th align=right>&nbsp;</th><td><input type=checkbox name=mf_lmos checked>' . _("Leave Mail on Server") . '</td></tr>' .
-                '<tr><th align=right>&nbsp;</th><td><input type=checkbox name=mf_login>' . _("Check mail during login") . '</td></tr>' .
-                '<tr><th align=right>&nbsp;</th><td><input type=checkbox name=mf_fref>' . _("Check mail during folder refresh") . '</td></tr>' .
-                '<tr><td align=center colspan=2><input type=submit name=submit_mailfetch value="' . _("Add Server") . '"></td></tr>' .
-                '</table></form></td></tr></TABLE>';
-
-            // Modify Server
-            echo '<font size=-5><BR></font>' .
-                '<TABLE WIDTH=70% COLS=1 ALIGN=CENTER>' .
-                "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><b>" . _("Modify Server") . '</b></TD></TR>' .
-                "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>";
-            if ($mailfetch_server_number>0) {
-                echo "<form action=\"$PHP_SELF\" METHOD=\"GET\" TARGET=_self>";
-                echo '<b>' . _("Server Name:") . '</b> <SELECT NAME="mf_sn">';
-                for ($i=0;$i<$mailfetch_server_number;$i++) {
-                    echo "<OPTION VALUE=\"$i\">" .
-                        (($mailfetch_alias_[$i]=='')?$mailfetch_server_[$i]:$mailfetch_alias_[$i]) . "</OPTION>>";
-                }
-                echo '</SELECT>&nbsp;&nbsp;<INPUT TYPE="hidden" NAME="mf_action" VALUE="modify"><INPUT TYPE=submit name=submit_mailfetch value="' . _("Modify") . '"></form>';
-            } else { echo _("No-one server in use. Try to add."); }
-            echo '</TD></TR></TABLE>';
-
-            // Delete Server
-            echo '<font size=-5><BR></font>' .
-                '<TABLE WIDTH=70% COLS=1 ALIGN=CENTER>' .
-                "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><b>" . _("Delete Server") . '</b></TD></TR>' .
-                "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>";
-            if ($mailfetch_server_number>0) {
-                echo "<form action=\"$PHP_SELF\" METHOD=\"GET\" TARGET=_self>" .
-                    '<b>' . _("Server Name:") . '</b> <SELECT NAME="mf_sn">';
-
-                for ($i=0;$i<$mailfetch_server_number;$i++) {
-                    echo "<OPTION VALUE=\"$i\">" .
-                        (($mailfetch_alias_[$i]=='')?$mailfetch_server_[$i]:$mailfetch_alias_[$i]) . "</OPTION>>";
-                }
-                echo '</SELECT>&nbsp;&nbsp;<INPUT TYPE="hidden" NAME="mf_action" VALUE="delete"><INPUT TYPE=submit name=submit_mailfetch value="' . _("Delete") . '"></form>';
-            } else { echo _("No-one server in use. Try to add."); }
-            echo '</TD></TR></TABLE>';
+        }
+        echo '</SELECT></td></tr>' .
+            '<tr><th align=right>&nbsp;</th><td><input type=checkbox name=mf_lmos checked>' . _("Leave Mail on Server") . '</td></tr>' .
+            '<tr><th align=right>&nbsp;</th><td><input type=checkbox name=mf_login>' . _("Check mail during login") . '</td></tr>' .
+            '<tr><th align=right>&nbsp;</th><td><input type=checkbox name=mf_fref>' . _("Check mail during folder refresh") . '</td></tr>' .
+            '<tr><td align=center colspan=2><input type=submit name=submit_mailfetch value="' . _("Add Server") . '"></td></tr>' .
+            '</table></form></td></tr></TABLE>';
 
-        } elseif ($mf_action=="delete") { //erase confirmation about a server
-            echo '<TABLE WIDTH=95% COLS=1 ALIGN=CENTER>' .
-                "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>" . _("Fetching Servers") . '</b></TD></TR>' .
-                '</TABLE>' .
-                '<font size=-5><BR></font>' .
-                '<TABLE WIDTH=70% COLS=1 ALIGN=CENTER>' .
-                "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><b>" . _("Confirm Deletion of a Server") . '</b></TD></TR>' .
-                "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>" .
-                "<INPUT TYPE=\"hidden\" NAME=\"mf_sn\" VALUE=\"$mf_sn\">" .
-                '<INPUT TYPE="hidden" NAME="mf_action" VALUE="confirm_delete">' .
-                '<br>' . _("Selected Server:") . "<b>$mailfetch_server_[$mf_sn]</b><br>" .
-                _("Confirm delete of selected server?") . '<br><br>' .
-                '<input type=submit name=submit_mailfetch value="Confirm Delete">' .
-                '</form></TD></TR></TABLE>';
-        } elseif ($mf_action=="modify") { //modify a server
-            echo '<TABLE WIDTH=95% COLS=1 ALIGN=CENTER>' .
-                "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>" . _("Fetching Servers") . '</b></TD></TR>' .
-                '</TABLE>' .
-                '<font size=-5><BR></font>' .
-                '<TABLE WIDTH=70% COLS=1 ALIGN=CENTER>' .
-                "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><b>" . _("Mofify a Server") . '</b></TD></TR>' .
-                "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>" .
-                "<INPUT TYPE=\"hidden\" NAME=\"mf_sn\" VALUE=\"$mf_sn\">" .
-                '<INPUT TYPE="hidden" NAME="mf_action" VALUE="confirm_modify">' .
-                '<table>' .
-                '<tr><th align=right>' . _("Server:") . '</th>' .
-                "<td><input type=text name=mf_server value=\"$mailfetch_server_[$mf_sn]\" size=40></td></tr>" .
-                '<tr><th align=right>' . _("Alias:") . '</th>' .
-                "<td><input type=text name=mf_alias value=\"$mailfetch_alias_[$mf_sn]\" size=40></td></tr>" .
-                '<tr><th align=right>' . _("Username:") . '</th>' .
-                "<td><input type=text name=mf_user value=\"$mailfetch_user_[$mf_sn]\" size=20></td></tr>" .
-                '<tr><th align=right>' . _("Password:") . '</th>' .
-                "<td><input type=password name=mf_pass value=\"$mailfetch_pass_[$mf_sn]\" size=20></td></tr>" .
-                '<tr><th align=right>' . _("Store in Folder:") . '</th><td>';
-            $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
-            $boxes = sqimap_mailbox_list($imapConnection);
-            echo "<SELECT NAME=mf_subfolder>";
-            echo "<OPTION " . ($mailfetch_subfolder_[$mf_sn]==""?"SELECTED":"") . ' VALUE="">INBOX';
-            for ($i = 0; $i < count($boxes); $i++) {
-                if (in_array('noinferiors', $boxes[$i]['flags'])) {
-                    if ((strtolower($boxes[$i]["unformatted"]) == "inbox") && ($default_sub_of_inbox == true)) {
-                            $box = $boxes[$i]["unformatted"];
-                            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
+        // Modify Server
+        echo '<font size=-5><BR></font>' .
+            '<TABLE WIDTH=70% COLS=1 ALIGN=CENTER cellpadding=5 cellspacing=1>' .
+            "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><b>" . _("Modify Server") . '</b></TD></TR>' .
+            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>";
+        if ($mailfetch_server_number>0) {
+            echo "<form action=\"$PHP_SELF\" METHOD=\"POST\" TARGET=_self>";
+            echo '<b>' . _("Server Name:") . '</b> <SELECT NAME="mf_sn">';
+            for ($i=0;$i<$mailfetch_server_number;$i++) {
+                echo "<OPTION VALUE=\"$i\">" .
+                    (($mailfetch_alias_[$i]=='')?$mailfetch_server_[$i]:$mailfetch_alias_[$i]) . "</OPTION>>";
+            }
+            echo '</SELECT>'.
+                 '&nbsp;&nbsp;<INPUT TYPE=submit name=mf_action value="' . _("Modify") . '">'.
+                 '&nbsp;&nbsp;<INPUT TYPE=submit name=mf_action value="' . _("Delete") . '">'.
+                 '</form>';
+        } else {
+            echo _("No-one server in use. Try to add.");
+        }
+        echo '</TD></TR></TABLE>';
+        break;
+    case _("Delete"):                                     //erase confirmation about a server
+        echo '<TABLE WIDTH=95% COLS=1 ALIGN=CENTER cellpadding=5 cellspacing=1>' .
+            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>" . _("Fetching Servers") . '</b></TD></TR>' .
+            '</TABLE>' .
+            '<BR>' .
+            '<TABLE WIDTH=70% COLS=1 ALIGN=CENTER cellpadding=5 cellspacing=1>' .
+            "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><b>" . _("Confirm Deletion of a Server") . '</b></TD></TR>' .
+            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>" .
+            "<INPUT TYPE=\"hidden\" NAME=\"mf_sn\" VALUE=\"$mf_sn\">" .
+            '<INPUT TYPE="hidden" NAME="mf_action" VALUE="confirm_delete">' .
+            '<br>' . _("Selected Server:") . "<b>$mailfetch_server_[$mf_sn]</b><br>" .
+            _("Confirm delete of selected server?") . '<br><br>' .
+            '<input type=submit name=submit_mailfetch value="' . _("Confirm Delete") . '">' .
+            '<br></form></TD></TR></TABLE>';
+        break;                                  //modify a server
+    case _("Modify"):
+        echo '<TABLE WIDTH=95% COLS=1 ALIGN=CENTER cellpadding=5 cellspacing=1>' .
+            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>" . _("Fetching Servers") . '</b></TD></TR>' .
+            '</TABLE>' .
+            '<BR>' .
+            '<TABLE WIDTH=70% COLS=1 ALIGN=CENTER cellpadding=5 cellspacing=1>' .
+            "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><b>" . _("Mofify a Server") . '</b></TD></TR>' .
+            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>" .
+            "<INPUT TYPE=\"hidden\" NAME=\"mf_sn\" VALUE=\"$mf_sn\">" .
+            '<INPUT TYPE="hidden" NAME="mf_action" VALUE="confirm_modify">' .
+            '<table>' .
+            '<tr><th align=right>' . _("Server:") . '</th>' .
+            "<td><input type=text name=mf_server value=\"$mailfetch_server_[$mf_sn]\" size=40></td></tr>" .
+            '<tr><th align=right>' . _("Alias:") . '</th>' .
+            "<td><input type=text name=mf_alias value=\"$mailfetch_alias_[$mf_sn]\" size=40></td></tr>" .
+            '<tr><th align=right>' . _("Username:") . '</th>' .
+            "<td><input type=text name=mf_user value=\"$mailfetch_user_[$mf_sn]\" size=20></td></tr>" .
+            '<tr><th align=right>' . _("Password:") . '</th>' .
+            "<td><input type=password name=mf_pass value=\"$mailfetch_pass_[$mf_sn]\" size=20></td></tr>" .
+            '<tr><th align=right>' . _("Store in Folder:") . '</th><td>';
+        $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
+        $boxes = sqimap_mailbox_list($imapConnection);
+        echo "<SELECT NAME=mf_subfolder>";
+        echo "<OPTION " . ($mailfetch_subfolder_[$mf_sn]==""?"SELECTED":"") . ' VALUE="">INBOX';
+        for ($i = 0; $i < count($boxes); $i++) {
+            if (in_array('noinferiors', $boxes[$i]['flags'])) {
+                if ((strtolower($boxes[$i]['unformatted']) == 'inbox') &&
+                    $default_sub_of_inbox) {
+                        $box = $boxes[$i]['unformatted'];
+                        $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
+                        echo "<OPTION " . (strcmp($mailfetch_subfolder_[$mf_sn],$box)==0?"SELECTED":"") . " VALUE=\"$box\">$box2";
+                } else {
+                        $box = $boxes[$i]['unformatted'];
+                        $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
+                        if (strtolower($imap_server_type) != 'courier' ||
+                            strtolower($box) != 'inbox.trash')
                             echo "<OPTION " . (strcmp($mailfetch_subfolder_[$mf_sn],$box)==0?"SELECTED":"") . " VALUE=\"$box\">$box2";
-                    } else {
-                            $box = $boxes[$i]["unformatted"];
-                            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
-                            if (strtolower($imap_server_type) != "courier" ||
-                                strtolower($box) != "inbox.trash")
-                                echo "<OPTION " . (strcmp($mailfetch_subfolder_[$mf_sn],$box)==0?"SELECTED":"") . " VALUE=\"$box\">$box2";
-                    }
                 }
             }
-            echo '</SELECT></td></tr>' .
-                '<tr><th align=right>&nbsp;</th>' .
-                '<td><input type=checkbox name=mf_lmos ' . (($mailfetch_lmos_[$mf_sn] == 'on')?'checked':'') .
-                '>' . _("Leave Mail on Server") . '</td></tr>' .
-                '<tr><th align=right>&nbsp;</TH><td><input type=checkbox name=mf_login ' . ( ($mailfetch_login_[$mf_sn] == 'on')?'checked':'') .
-                '>' . _("Check mail during login") . '</td></tr>' .
-                '<tr><th align=right>&nbsp;</TH><td><input type=checkbox name=mf_fref ' . ( ($mailfetch_fref_[$mf_sn] == 'on')?'checked':'') .
-                '>' . _("Check mail during folder refresh") . '</td></tr>' .
-                '<tr><td align=center colspan=2><input type=submit name=submit_mailfetch value="' . _("Modify Server") . '"></td></tr>' .
-                '</table></form></TD></TR></TABLE>';
-        } else { //unsupported action
-            echo '</form><TABLE WIDTH=95% COLS=1 ALIGN=CENTER>' .
-                "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>" . _("Fetching Servers") . '</b></TD></TR>' .
-                '</TABLE><BR>' .
-                '<TABLE WIDTH=70% COLS=1 ALIGN=CENTER>' .
-                "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><b>" . _("Undefined Function") . '</b></TD></TR>' .
-                "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>" .
-                _("Hey! Wath do You are looking for?") . '</b></TD></TR></TABLE>';
         }
+        echo '</SELECT></td></tr>' .
+            '<tr><th align=right>&nbsp;</th>' .
+            '<td><input type=checkbox name=mf_lmos ' . (($mailfetch_lmos_[$mf_sn] == 'on')?'checked':'') .
+            '>' . _("Leave Mail on Server") . '</td></tr>' .
+            '<tr><th align=right>&nbsp;</TH><td><input type=checkbox name=mf_login ' . ( ($mailfetch_login_[$mf_sn] == 'on')?'checked':'') .
+            '>' . _("Check mail during login") . '</td></tr>' .
+            '<tr><th align=right>&nbsp;</TH><td><input type=checkbox name=mf_fref ' . ( ($mailfetch_fref_[$mf_sn] == 'on')?'checked':'') .
+            '>' . _("Check mail during folder refresh") . '</td></tr>' .
+            '<tr><td align=center colspan=2><input type=submit name=submit_mailfetch value="' . _("Modify Server") . '"></td></tr>' .
+            '</table></form></TD></TR></TABLE>';
+        break;
+    default:                                    //unsupported action
+        echo '</form><TABLE WIDTH=95% COLS=1 ALIGN=CENTER>' .
+            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>" . _("Fetching Servers") . '</b></TD></TR>' .
+            '</TABLE><BR>' .
+            '<TABLE WIDTH=70% COLS=1 ALIGN=CENTER>' .
+            "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><b>" . _("Undefined Function") . '</b></TD></TR>' .
+            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>" .
+            _("Hey! Wath do You are looking for?") . '</b></TD></TR></TABLE>';
+    }
 
     ?>
 </body></html>
\ No newline at end of file
diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php
index cbf4d917..ceb73908 100644
--- a/plugins/mail_fetch/setup.php
+++ b/plugins/mail_fetch/setup.php
@@ -1,16 +1,26 @@
 <?php
 
+   /**
+    **  mail_fetch/setup.php
+    **
+    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
+    **  Licensed under the GNU GPL. For full terms see the file COPYING.
+    **
+    **  Setup of the mailfetch plugin.
+    **
+    **  $Id$
+    **/
+
     require_once( '../plugins/mail_fetch/functions.php' );
 
     function squirrelmail_plugin_init_mail_fetch() {
         global $squirrelmail_plugin_hooks;
         global $mailbox, $imap_stream, $imapConnection;
 
-        $squirrelmail_plugin_hooks["menuline"]["mail_fetch"] = 'mail_fetch_link';
-        $squirrelmail_plugin_hooks["options_save"]["mail_fetch"] = "mail_fetch_save_pref";
-        $squirrelmail_plugin_hooks["loading_prefs"]["mail_fetch"] = "mail_fetch_load_pref";
-        $squirrelmail_plugin_hooks["login_verified"]["mail_fetch"] = "mail_fetch_setnew";
-        $squirrelmail_plugin_hooks["left_main_before"]["mail_fetch"] = "mail_fetch_login";
+        $squirrelmail_plugin_hooks['menuline']['mail_fetch'] = 'mail_fetch_link';
+        $squirrelmail_plugin_hooks['loading_prefs']['mail_fetch'] = 'mail_fetch_load_pref';
+        $squirrelmail_plugin_hooks['login_verified']['mail_fetch'] = 'mail_fetch_setnew';
+        $squirrelmail_plugin_hooks['left_main_before']['mail_fetch'] = 'mail_fetch_login';
         $squirrelmail_plugin_hooks['optpage_register_block']['mail_fetch'] = 'mailfetch_optpage_register_block';
 
     }
@@ -31,10 +41,9 @@
         global $mailfetch_lmos_, $mailfetch_uidl_, $mailfetch_login_, $mailfetch_fref_;
         global $PHP_SELF;
 
-        if( stristr( $PHP_SELF, 'mail_fetch'    ) ) {
-            $mailfetch_server_number = getPref($data_dir, $username,    "mailfetch_server_number");
-            if (!isset($mailfetch_server_number)) $mailfetch_server_number=0;
-            $mailfetch_cypher = getPref($data_dir, $username, "mailfetch_cypher");
+        if( stristr( $PHP_SELF, 'mail_fetch' ) ) {
+            $mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number', 0);
+            $mailfetch_cypher = getPref($data_dir, $username, 'mailfetch_cypher', 'on' );
             if ($mailfetch_server_number<1) $mailfetch_server_number=0;
             for ($i=0;$i<$mailfetch_server_number;$i++) {
                 $mailfetch_server_[$i] = getPref($data_dir, $username, "mailfetch_server_$i");
@@ -50,71 +59,6 @@
         }
     }
 
-    function mail_fetch_save_pref() {
-        global $username,$data_dir;
-        global $mf_server, $mf_user, $mf_pass, $mf_lmos, $mf_alias;
-        global $mf_cypher;
-        global $mf_uidl;
-        global $mf_login, $mf_fref, $submit_mailfetch;
-        global $mf_action, $mf_sn, $mf_subfolder;
-
-        if (isset($submit_mailfetch))   {
-            if ($mf_action=="add") {
-                //add new server
-                if ($mf_sn<1) $mf_sn=0;
-                if (!isset($mf_server)) return;
-                setPref($data_dir,$username,"mailfetch_server_$mf_sn", (isset($mf_server)?$mf_server:""));
-                setPref($data_dir,$username,"mailfetch_alias_$mf_sn", (isset($mf_alias)?$mf_alias:""));
-                setPref($data_dir,$username,"mailfetch_user_$mf_sn",(isset($mf_user)?$mf_user:""));
-                setPref($data_dir,$username,"mailfetch_pass_$mf_sn",(isset($mf_pass)?encrypt( $mf_pass )    :""));
-                if( $mf_cypher <> 'on' ) SetPref($data_dir,$username,"mailfetch_cypher",    'on');
-                setPref($data_dir,$username,"mailfetch_lmos_$mf_sn",(isset($mf_lmos)?$mf_lmos:""));
-                setPref($data_dir,$username,"mailfetch_login_$mf_sn",(isset($mf_login)?$mf_login:""));
-                setPref($data_dir,$username,"mailfetch_fref_$mf_sn",(isset($mf_fref)?$mf_fref:""));
-                setPref($data_dir,$username,"mailfetch_subfolder_$mf_sn",(isset($mf_subfolder)?$mf_subfolder:""));
-                $mf_sn++;
-                setPref($data_dir,$username,"mailfetch_server_number", $mf_sn);
-            } elseif ($mf_action=="confirm_modify") {
-                //modify    a server
-                if (!isset($mf_server)) return;
-                setPref($data_dir,$username,"mailfetch_server_$mf_sn", (isset($mf_server)?$mf_server:""));
-                setPref($data_dir,$username,"mailfetch_alias_$mf_sn", (isset($mf_alias)?$mf_alias:""));
-                setPref($data_dir,$username,"mailfetch_user_$mf_sn",(isset($mf_user)?$mf_user:""));
-                setPref($data_dir,$username,"mailfetch_pass_$mf_sn",(isset($mf_pass)?encrypt( $mf_pass )    :""));
-                if( $mf_cypher <> 'on' ) setPref($data_dir,$username,"mailfetch_cypher", 'on');
-                setPref($data_dir,$username,"mailfetch_lmos_$mf_sn",(isset($mf_lmos)?$mf_lmos:""));
-                setPref($data_dir,$username,"mailfetch_login_$mf_sn",(isset($mf_login)?$mf_login:""));
-                setPref($data_dir,$username,"mailfetch_fref_$mf_sn",(isset($mf_fref)?$mf_fref:""));
-                setPref($data_dir,$username,"mailfetch_subfolder_$mf_sn",(isset($mf_subfolder)?$mf_subfolder:""));
-            } elseif ($mf_action=="confirm_delete") {
-                //delete    a server
-                $mailfetch_server_number    = getPref($data_dir, $username, "mailfetch_server_number");
-                if ($mf_sn+1==$mailfetch_server_number) {
-                    //is the last server, whe can only decrase $mailfetch_server_number
-                    $mailfetch_server_number--;
-                    setPref($data_dir,$username,"mailfetch_server_number", $mailfetch_server_number);
-                } else {
-                    //if not the last, all the sequel server come up one step
-                    //then whe decrase $mailfetch_server_number
-                    $mailfetch_server_number--;
-                    for ($i=$mf_sn;$i<$mailfetch_server_number;$i++) {
-                        $tmp=$i+1;
-                        setPref($data_dir,$username,"mailfetch_server_$mf_sn", getPref($data_dir, $username, "mailfetch_server_$tmp"));
-                        setPref($data_dir,$username,"mailfetch_alias_$mf_sn", getPref($data_dir, $username, "mailfetch_alias_$tmp"));
-                        setPref($data_dir,$username,"mailfetch_user_$mf_sn", getPref($data_dir, $username, "mailfetch_user_$tmp"));
-                        setPref($data_dir,$username,"mailfetch_pass_$mf_sn",(isset($mf_pass)?encrypt( $mf_pass ) :""));
-                        // if( $mf_cypher <> 'on' ) setPref($data_dir,$username,"mailfetch_cypher", 'on');
-                        setPref($data_dir,$username,"mailfetch_lmos_$mf_sn", getPref($data_dir, $username, "mailfetch_lmos_$tmp"));
-                        setPref($data_dir,$username,"mailfetch_login_$mf_sn", getPref($data_dir, $username, "mailfetch_login_$tmp"));
-                        setPref($data_dir,$username,"mailfetch_fref_$mf_sn", getPref($data_dir, $username, "mailfetch_fref_$tmp"));
-                        setPref($data_dir,$username,"mailfetch_subfolder_$mf_sn", getPref($data_dir, $username, "mailfetch_subfolder_$tmp"));
-                    }
-                    setPref($data_dir,$username,"mailfetch_server_number", $mailfetch_server_number);
-                }
-            }
-        }
-    }
-
     function mail_fetch_login() {
 
         require_once ('../src/validate.php');
@@ -129,9 +73,9 @@
 
         $outMsg = '';
 
-        $mailfetch_server_number = getPref($data_dir, $username, "mailfetch_server_number");
+        $mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number');
         if (!isset($mailfetch_server_number)) $mailfetch_server_number=0;
-        $mailfetch_cypher = getPref($data_dir, $username, "mailfetch_cypher");
+        $mailfetch_cypher = getPref($data_dir, $username, 'mailfetch_cypher');
         if ($mailfetch_server_number<1) $mailfetch_server_number=0;
 
         for ($i_loop=0;$i_loop<$mailfetch_server_number;$i_loop++) {
diff --git a/po/squirrelmail.po b/po/squirrelmail.po
index 20358635..b33fa681 100644
--- a/po/squirrelmail.po
+++ b/po/squirrelmail.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-11-23 19:58+0100\n"
+"POT-Creation-Date: 2001-11-24 09:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -257,7 +257,7 @@ msgstr ""
 
 #: squirrelmail/functions/mailbox_display.php:516
 #: squirrelmail/plugins/filters/options.php:86
-#: squirrelmail/plugins/mail_fetch/options.php:119
+#: squirrelmail/plugins/mail_fetch/options.php:185
 #: squirrelmail/src/folders.php:104 squirrelmail/src/read_body.php:452
 msgid "Delete"
 msgstr ""
@@ -274,7 +274,6 @@ msgstr ""
 msgid "as a subfolder of"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:18
 #: squirrelmail/src/folders.php:125 squirrelmail/src/folders.php:127
 msgid "None"
 msgstr ""
@@ -401,8 +400,8 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:62
-#: squirrelmail/plugins/mail_fetch/options.php:154
+#: squirrelmail/plugins/mail_fetch/options.php:126
+#: squirrelmail/plugins/mail_fetch/options.php:223
 #: squirrelmail/src/login.php:127
 msgid "Password:"
 msgstr ""
@@ -671,7 +670,7 @@ msgid "New"
 msgstr ""
 
 #: squirrelmail/plugins/filters/options.php:76
-#: squirrelmail/plugins/mail_fetch/fetch.php:217
+#: squirrelmail/plugins/mail_fetch/fetch.php:225
 #: squirrelmail/src/options_highlight.php:55
 msgid "Done"
 msgstr ""
@@ -2674,303 +2673,303 @@ msgstr ""
 msgid "Loading the sound..."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:73
 #: squirrelmail/plugins/mail_fetch/class.POP3.php:81
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:93
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:89
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:101
 msgid "POP3 connect:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:73
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:81
 msgid "No server specified"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:81
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:93
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:132
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:267
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:321
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:332
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:380
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:413
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:446
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:545
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:568
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:89
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:101
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:140
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:275
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:329
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:340
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:388
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:421
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:454
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:553
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:576
 msgid "Error "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:101
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:109
 msgid "POP3: premature NOOP OK, NOT an RFC 1939 Compliant server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:111
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:119
 msgid "POP3 noop:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:111
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:177
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:226
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:251
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:293
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:367
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:406
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:436
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:470
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:533
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:601
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:119
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:185
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:234
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:259
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:301
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:375
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:414
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:444
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:478
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:541
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:609
 msgid "No connection to server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:124
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:127
 #: squirrelmail/plugins/mail_fetch/class.POP3.php:132
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:135
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:140
 msgid "POP3 user:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:124
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:132
 msgid "no login ID submitted"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:127
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:147
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:135
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:155
 msgid "connection not established"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:144
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:147
 #: squirrelmail/plugins/mail_fetch/class.POP3.php:152
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:161
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:155
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:160
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:169
 msgid "POP3 pass:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:144
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:186
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:152
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:194
 msgid "No password submitted"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:152
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:160
 msgid "authentication failed "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:161
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:210
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:169
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:218
 msgid "NOOP failed. Server not RFC 1939 compliant"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:177
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:183
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:186
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:185
 #: squirrelmail/plugins/mail_fetch/class.POP3.php:191
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:201
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:210
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:194
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:199
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:209
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:218
 msgid "POP3 apop:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:183
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:191
 msgid "No login ID submitted"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:191
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:199
 msgid "No server banner"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:191
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:201
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:199
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:209
 msgid "abort"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:201
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:209
 msgid "apop authentication failed"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:226
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:234
 msgid "POP3 login:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:251
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:267
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:259
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:275
 msgid "POP3 top:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:293
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:321
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:332
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:344
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:301
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:329
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:340
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:352
 msgid "POP3 pop_list:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:344
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:352
 msgid "Premature end of list"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:367
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:380
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:375
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:388
 msgid "POP3 get:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:406
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:413
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:414
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:421
 msgid "POP3 last:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:436
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:446
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:444
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:454
 msgid "POP3 reset:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:470
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:476
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:478
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:484
 msgid "POP3 send_cmd:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:476
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:484
 msgid "Empty command string"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:496
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:504
 msgid "POP3 quit:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:496
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:504
 msgid "connection does not exist"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:533
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:545
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:568
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:541
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:553
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:576
 msgid "POP3 uidl:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:601
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:606
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:612
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:609
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:614
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:620
 msgid "POP3 delete:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:606
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:614
 msgid "No msg number submitted"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:612
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:620
 msgid "Command failed "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:46
+#: squirrelmail/plugins/mail_fetch/fetch.php:54
 msgid "Remote POP server Fetching Mail"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:55
+#: squirrelmail/plugins/mail_fetch/fetch.php:63
 msgid "Select Server:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:57
+#: squirrelmail/plugins/mail_fetch/fetch.php:65
 msgid "All"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:70
+#: squirrelmail/plugins/mail_fetch/fetch.php:78
 msgid "Password for"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:77
+#: squirrelmail/plugins/mail_fetch/fetch.php:85
 msgid "Fetch Mail"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:109
+#: squirrelmail/plugins/mail_fetch/fetch.php:117
 msgid "Fetching from "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:116
-#: squirrelmail/plugins/mail_fetch/fetch.php:176
+#: squirrelmail/plugins/mail_fetch/fetch.php:124
+#: squirrelmail/plugins/mail_fetch/fetch.php:184
 msgid "Oops, "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:120
+#: squirrelmail/plugins/mail_fetch/fetch.php:128
 msgid "Opening IMAP server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:123
+#: squirrelmail/plugins/mail_fetch/fetch.php:131
 msgid "Opening POP server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:126
-#: squirrelmail/plugins/mail_fetch/setup.php:197
+#: squirrelmail/plugins/mail_fetch/fetch.php:134
+#: squirrelmail/plugins/mail_fetch/setup.php:123
 msgid "Login Failed:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:143
+#: squirrelmail/plugins/mail_fetch/fetch.php:151
 msgid "Login OK: No new messages"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:148
+#: squirrelmail/plugins/mail_fetch/fetch.php:156
 msgid "Login OK: Inbox EMPTY"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:153
+#: squirrelmail/plugins/mail_fetch/fetch.php:161
 msgid "Login OK: Inbox contains ["
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:153
+#: squirrelmail/plugins/mail_fetch/fetch.php:161
 msgid "] messages"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:156
+#: squirrelmail/plugins/mail_fetch/fetch.php:164
 msgid "Fetching UIDL..."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:161
-#: squirrelmail/plugins/mail_fetch/setup.php:228
+#: squirrelmail/plugins/mail_fetch/fetch.php:169
+#: squirrelmail/plugins/mail_fetch/setup.php:154
 msgid "Server does not support UIDL."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:164
+#: squirrelmail/plugins/mail_fetch/fetch.php:172
 msgid "Leaving Mail on Server..."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:166
+#: squirrelmail/plugins/mail_fetch/fetch.php:174
 msgid "Deleting messages from server..."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:170
+#: squirrelmail/plugins/mail_fetch/fetch.php:178
 msgid "Fetching message "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:193
+#: squirrelmail/plugins/mail_fetch/fetch.php:201
 msgid "Message appended to mailbox"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:197
+#: squirrelmail/plugins/mail_fetch/fetch.php:205
 msgid "Message "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:197
+#: squirrelmail/plugins/mail_fetch/fetch.php:205
 msgid " deleted from Remote Server!"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:199
+#: squirrelmail/plugins/mail_fetch/fetch.php:207
 msgid "Delete failed:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:204
-#: squirrelmail/plugins/mail_fetch/setup.php:259
+#: squirrelmail/plugins/mail_fetch/fetch.php:212
+#: squirrelmail/plugins/mail_fetch/setup.php:185
 msgid "Error Appending Message!"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:208
+#: squirrelmail/plugins/mail_fetch/fetch.php:216
 msgid "Closing POP"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:210
+#: squirrelmail/plugins/mail_fetch/fetch.php:218
 msgid "Logging out from IMAP"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:213
+#: squirrelmail/plugins/mail_fetch/fetch.php:221
 msgid "Saving UIDL"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:40
+#: squirrelmail/plugins/mail_fetch/options.php:105
 msgid "Remote POP server settings"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:42
+#: squirrelmail/plugins/mail_fetch/options.php:107
 msgid ""
 "You should be aware that the encryption used to store your password is not "
 "perfectly secure.  However, if you are using pop, there is inherently no "
@@ -2978,126 +2977,130 @@ msgid ""
 "server can be undone by a hacker reading the source to this file."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:44
+#: squirrelmail/plugins/mail_fetch/options.php:109
 msgid "If you leave password empty, it will be required when you fetch mail."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:48
+#: squirrelmail/plugins/mail_fetch/options.php:113
 msgid "Encrypt passwords (informative only)"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:55
-#: squirrelmail/plugins/mail_fetch/options.php:87
+#: squirrelmail/plugins/mail_fetch/options.php:119
+#: squirrelmail/plugins/mail_fetch/options.php:151
 msgid "Add Server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:59
-#: squirrelmail/plugins/mail_fetch/options.php:148
+#: squirrelmail/plugins/mail_fetch/options.php:123
+#: squirrelmail/plugins/mail_fetch/options.php:217
 msgid "Server:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:60
-#: squirrelmail/plugins/mail_fetch/options.php:150
+#: squirrelmail/plugins/mail_fetch/options.php:124
+#: squirrelmail/plugins/mail_fetch/options.php:219
 msgid "Alias:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:61
-#: squirrelmail/plugins/mail_fetch/options.php:152
+#: squirrelmail/plugins/mail_fetch/options.php:125
+#: squirrelmail/plugins/mail_fetch/options.php:221
 msgid "Username:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:63
-#: squirrelmail/plugins/mail_fetch/options.php:156
+#: squirrelmail/plugins/mail_fetch/options.php:127
+#: squirrelmail/plugins/mail_fetch/options.php:225
 msgid "Store in Folder:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:84
-#: squirrelmail/plugins/mail_fetch/options.php:179
+#: squirrelmail/plugins/mail_fetch/options.php:148
+#: squirrelmail/plugins/mail_fetch/options.php:248
 msgid "Leave Mail on Server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:85
-#: squirrelmail/plugins/mail_fetch/options.php:181
+#: squirrelmail/plugins/mail_fetch/options.php:149
+#: squirrelmail/plugins/mail_fetch/options.php:250
 msgid "Check mail during login"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:86
-#: squirrelmail/plugins/mail_fetch/options.php:183
+#: squirrelmail/plugins/mail_fetch/options.php:150
+#: squirrelmail/plugins/mail_fetch/options.php:252
 msgid "Check mail during folder refresh"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:93
-#: squirrelmail/plugins/mail_fetch/options.php:184
+#: squirrelmail/plugins/mail_fetch/options.php:157
+#: squirrelmail/plugins/mail_fetch/options.php:253
 msgid "Modify Server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:97
-#: squirrelmail/plugins/mail_fetch/options.php:113
+#: squirrelmail/plugins/mail_fetch/options.php:161
+#: squirrelmail/plugins/mail_fetch/options.php:179
 msgid "Server Name:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:102
+#: squirrelmail/plugins/mail_fetch/options.php:166
 msgid "Modify"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:103
-#: squirrelmail/plugins/mail_fetch/options.php:120
+#: squirrelmail/plugins/mail_fetch/options.php:168
+#: squirrelmail/plugins/mail_fetch/options.php:187
 msgid "No-one server in use. Try to add."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:109
+#: squirrelmail/plugins/mail_fetch/options.php:175
 msgid "Delete Server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:125
-#: squirrelmail/plugins/mail_fetch/options.php:139
-#: squirrelmail/plugins/mail_fetch/options.php:188
+#: squirrelmail/plugins/mail_fetch/options.php:193
+#: squirrelmail/plugins/mail_fetch/options.php:208
+#: squirrelmail/plugins/mail_fetch/options.php:258
 msgid "Fetching Servers"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:129
+#: squirrelmail/plugins/mail_fetch/options.php:197
 msgid "Confirm Deletion of a Server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:133
+#: squirrelmail/plugins/mail_fetch/options.php:201
 msgid "Selected Server:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:134
+#: squirrelmail/plugins/mail_fetch/options.php:202
 msgid "Confirm delete of selected server?"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:143
+#: squirrelmail/plugins/mail_fetch/options.php:203
+msgid "Confirm Delete"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:212
 msgid "Mofify a Server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:191
+#: squirrelmail/plugins/mail_fetch/options.php:261
 msgid "Undefined Function"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:193
+#: squirrelmail/plugins/mail_fetch/options.php:263
 msgid "Hey! Wath do You are looking for?"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/setup.php:20
+#: squirrelmail/plugins/mail_fetch/setup.php:30
 msgid "Fetch"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/setup.php:32
-msgid "Simple POP3 Fetch Mail"
+#: squirrelmail/plugins/mail_fetch/setup.php:115
+#: squirrelmail/plugins/mail_fetch/setup.php:162
+msgid "Warning, "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/setup.php:35
-msgid ""
-"This configures settings for downloading email from a pop3 mailbox to your "
-"account on this server."
+#: squirrelmail/plugins/mail_fetch/setup.php:198
+msgid "Mail Fetch Result:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/setup.php:189
-#: squirrelmail/plugins/mail_fetch/setup.php:236
-msgid "Warning, "
+#: squirrelmail/plugins/mail_fetch/setup.php:224
+msgid "Simple POP3 Fetch Mail"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/setup.php:272
-msgid "Mail Fetch Result:"
+#: squirrelmail/plugins/mail_fetch/setup.php:226
+msgid ""
+"This configures settings for downloading email from a pop3 mailbox to your "
+"account on this server."
 msgstr ""
-- 
2.25.1