From 134e4174c8919790bcc463587e90ac37cabc2f90 Mon Sep 17 00:00:00 2001
From: jervfors <jervfors@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 15 Aug 2004 23:18:30 +0000
Subject: [PATCH] Indentation fixes and minor cleanups

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7917 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 src/addrbook_search.php         |  10 +-
 src/addressbook.php             |  76 +++----
 src/configtest.php              | 114 +++++-----
 src/delete_message.php          |   6 +-
 src/download.php                |   2 +-
 src/empty_trash.php             |   2 +-
 src/folders.php                 |  55 +++--
 src/folders_subscribe.php       |   4 +-
 src/help.php                    |  26 +--
 src/left_main.php               |  81 ++++----
 src/login.php                   |  13 +-
 src/mailto.php                  |   2 +-
 src/options_highlight.php       |  40 ++--
 src/options_order.php           |  10 +-
 src/printer_friendly_bottom.php |  10 +-
 src/read_body.php               |  12 +-
 src/redirect.php                |   4 +-
 src/right_main.php              |   1 +
 src/search.php                  | 354 ++++++++++++++++----------------
 src/vcard.php                   |  12 +-
 src/view_header.php             |  49 ++---
 src/webmail.php                 |  10 +-
 22 files changed, 449 insertions(+), 444 deletions(-)

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index ded84c02..f8617a5c 100644
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -206,23 +206,23 @@ $abook = addressbook_init();
 /* Create search form */
 if ($show == 'form' && empty($listall)) {
     echo '<form name="sform" target="abookres" action="addrbook_search.php'. 
-         '" method="post">' . "\n" .
+            '" method="post">' . "\n" .
          html_tag( 'table', '', '', '', 'border="0" width="100%" height="100%"' ) .
          html_tag( 'tr' ) .
          html_tag( 'td', '  <strong>' . _("Search for") . "</strong>\n", 'left', '', 'nowrap valign="middle" width="10%"' ) .
          html_tag( 'td', '', 'left', '', '' ) .
-	     addInput('query', $query, 28);
+         addInput('query', $query, 28);
 
     /* List all backends to allow the user to choose where to search */
     if ($abook->numbackends > 1) {
         echo '<strong>' . _("in") . '</strong>&nbsp;'."\n".
-	$selopts['-1'] = _("All address books");
-	
+             $selopts['-1'] = _("All address books");
+
         $ret = $abook->get_backend_list();
         while (list($undef,$v) = each($ret)) {
             $selopts[$v->bnum] = $v->sname;
         }
-	echo addSelect('backend', $selopts, '-1', TRUE);
+        echo addSelect('backend', $selopts, '-1', TRUE);
     } else {
         echo addHidden('backend', '-1');
     }
diff --git a/src/addressbook.php b/src/addressbook.php
index aaeb00fd..c0ff11ff 100644
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * addressbook.php
  *
@@ -360,35 +361,35 @@ if ($showaddrlist) {
             if($prevbackend != $row['backend']) {
                 if($prevbackend < 0) {
                     echo html_tag( 'table',
-                                    html_tag( 'tr',
-                                          html_tag( 'td',
-                                                     '<input type="submit" name="editaddr" value="' . 
-                                                     _("Edit selected") . "\" />\n" .
-                                                     '<input type="submit" name="deladdr" value="' .
-                                                     _("Delete selected") . "\" />\n",
-                                          'center', '', 'colspan="5"' )
-                                    ) .
-                                    html_tag( 'tr',
-                                          html_tag( 'td', '&nbsp;<br />', 'center', '', 'colspan="5"' )
-                                    ) ,
-                             'center' );
+                            html_tag( 'tr',
+                                html_tag( 'td',
+                                    '<input type="submit" name="editaddr" value="' . 
+                                        _("Edit selected") . "\" />\n" .
+                                    '<input type="submit" name="deladdr" value="' .
+                                        _("Delete selected") . "\" />\n",
+                                    'center', '', 'colspan="5"' )
+                                ) .
+                            html_tag( 'tr',
+                                html_tag( 'td', '&nbsp;<br />', 'center', '', 'colspan="5"' )
+                                ),
+                            'center' );
                     echo "\n<!-- start of address book table -->\n" .
-                      html_tag( 'table', '', 'center', '', 'border="0" cellpadding="1" cellspacing="0" width="90%"' ) .
-                      html_tag( 'tr', "\n" .
-                          html_tag( 'th', '&nbsp;', 'left', '', 'width="1%"' ) . "\n" .
-                          html_tag( 'th', _("Nickname") .
-                                    show_abook_sort_button($abook_sort_order, _("sort by nickname"), 0, 1)
-                                    , 'left', '', 'width="1%"' ) . "\n" .
-                          html_tag( 'th', _("Name") . 
-                                    show_abook_sort_button($abook_sort_order, _("sort by name"), 2, 3)
-                                    , 'left', '', 'width="1%"' ) . "\n" .
-                          html_tag( 'th', _("E-mail") . 
-                                    show_abook_sort_button($abook_sort_order, _("sort by email"), 4, 5)
-                                    , 'left', '', 'width="1%"' ) . "\n" .
-                          html_tag( 'th', _("Info") .
-                                    show_abook_sort_button($abook_sort_order, _("sort by info"), 6, 7)
-                                    , 'left', '', 'width="1%"' ) . "\n",
-                                '', $color[9] ) . "\n";
+                         html_tag( 'table', '', 'center', '', 'border="0" cellpadding="1" cellspacing="0" width="90%"' ) .
+                         html_tag( 'tr', "\n" .
+                            html_tag( 'th', '&nbsp;', 'left', '', 'width="1%"' ) . "\n" .
+                            html_tag( 'th', _("Nickname") .
+                                show_abook_sort_button($abook_sort_order, _("sort by nickname"), 0, 1),
+                                'left', '', 'width="1%"' ) . "\n" .
+                            html_tag( 'th', _("Name") . 
+                                show_abook_sort_button($abook_sort_order, _("sort by name"), 2, 3),
+                                'left', '', 'width="1%"' ) . "\n" .
+                            html_tag( 'th', _("E-mail") . 
+                                show_abook_sort_button($abook_sort_order, _("sort by email"), 4, 5),
+                                'left', '', 'width="1%"' ) . "\n" .
+                            html_tag( 'th', _("Info") .
+                                show_abook_sort_button($abook_sort_order, _("sort by info"), 6, 7),
+                                'left', '', 'width="1%"' ) . "\n",
+                            '', $color[9] ) . "\n";
                 }
 
                 // Separate different backends with <hr />
@@ -466,15 +467,15 @@ if ($showaddrlist) {
         /* End of list. Add edit/delete select buttons */
         if ($headerprinted) {
             echo html_tag( 'table',
-                           html_tag( 'tr',
-                                     html_tag( 'td',
-                                               '<input type="submit" name="editaddr" value="' . _("Edit selected") .
-                                               "\" />\n" .
-                                               '<input type="submit" name="deladdr" value="' . _("Delete selected") .
-                                               "\" />\n",
-                                               'center', '', 'colspan="5"' )
-                                     ),
-                           'center' );
+                    html_tag( 'tr',
+                        html_tag( 'td',
+                            '<input type="submit" name="editaddr" value="' . _("Edit selected") .
+                                "\" />\n" .
+                            '<input type="submit" name="deladdr" value="' . _("Delete selected") .
+                                "\" />\n",
+                            'center', '', 'colspan="5"' )
+                        ),
+                        'center' );
         }
         echo "</form>\n";
     }
@@ -497,5 +498,4 @@ echo "</form>\n";
 /* Add hook for anything that wants on the bottom */
 do_hook('addressbook_bottom');
 ?>
-
 </body></html>
diff --git a/src/configtest.php b/src/configtest.php
index 0990f320..54499c3b 100644
--- a/src/configtest.php
+++ b/src/configtest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SquirrelMail configtest script
  *
@@ -189,7 +190,7 @@ if($useSendmail) {
     $smtpline = fgets($stream, 1024);
     if(((int) $smtpline{0}) > 3) {
         do_err("Error connecting to SMTP server. Server error: ".
-	    htmlspecialchars($smtpline));
+        htmlspecialchars($smtpline));
     }
 
     fputs($stream, 'QUIT');
@@ -223,7 +224,7 @@ $stream = fsockopen( ($use_imap_tls?'tls://':'').$imapServerAddress, $imapPort,
 if(!$stream) {
     do_err("Error connecting to IMAP server \"$imapServerAddress:$imapPort\".".
         "Server error: ($errorNumber) ".
-	htmlspecialchars($errorString));
+    htmlspecialchars($errorString));
 }
 
 $imapline = fgets($stream, 1024);
@@ -274,7 +275,7 @@ echo "$IND timezone - ";
 if ( (!ini_get('safe_mode')) ||
     !strcmp(ini_get('safe_mode_allowed_env_vars'),'') ||
     preg_match('/^([\w_]+,)*TZ/', ini_get('safe_mode_allowed_env_vars')) ) {
-	echo "Webmail users can change their time zone settings.<br />\n";
+        echo "Webmail users can change their time zone settings.<br />\n";
 } else {
     echo "Webmail users can't change their time zone settings.<br />\n";
 }
@@ -283,54 +284,60 @@ if ( (!ini_get('safe_mode')) ||
 // Pear DB tests
 echo "Checking database functions...<br />\n";
 if($addrbook_dsn || $prefs_dsn || $addrbook_global_dsn) {
-	@include_once('DB.php');
-	if (class_exists('DB')) {
-	    echo "$IND PHP Pear DB support is present.<br />\n";
-	    $db_functions=array(
-		'dbase' => 'dbase_open', 
-		'fbsql' => 'fbsql_connect', 
-		'interbase' => 'ibase_connect', 
-		'informix' => 'ifx_connect',
-		'msql' => 'msql_connect',
-		'mssql' => 'mssql_connect',
-		'mysql' => 'mysql_connect',
-		'mysqli' => 'mysqli_connect',
-		'oci8' => 'ocilogon',
-		'odbc' => 'odbc_connect',
-		'pgsql' => 'pgsql_connect',
-		'sqlite' => 'sqlite_open',
-		'sybase' => 'sybase_connect'
-	    );
-
-	    $dsns = array();
-	    if($prefs_dsn) $dsns['preferences'] = $prefs_dsn;
-	    if($addrbook_dsn) $dsns['addressbook'] = $addrbook_dsn;
-	    if($addrbook_global_dsn) $dsns['global addressbook'] = $addrbook_global_dsn;
-	    
-            foreach($dsns as $type => $dsn) {
-	        $dbtype = array_shift(explode(':', $dsn));
-	        if(isset($db_functions[$dbtype]) && function_exists($db_functions[$dbtype])) {
-		    echo "$IND$dbtype database support present.<br />\n";
-
-		    // now, test this interface:
-
-		    $dbh = DB::connect($dsn, true);
-                    if (DB::isError($dbh)) {
-                        do_err('Database error: '. htmlspecialchars(DB::errorMessage($dbh)) .
-			    ' in ' .$type .' DSN.');
-                    }
-		    $dbh->disconnect();
-		    echo "$IND$type database connect successful.<br />\n";
-		    
-		} else {
-		    do_err($db.' database support not present!');
-		}
+    @include_once('DB.php');
+    if (class_exists('DB')) {
+        echo "$IND PHP Pear DB support is present.<br />\n";
+        $db_functions=array(
+            'dbase' => 'dbase_open', 
+            'fbsql' => 'fbsql_connect', 
+            'interbase' => 'ibase_connect', 
+            'informix' => 'ifx_connect',
+            'msql' => 'msql_connect',
+            'mssql' => 'mssql_connect',
+            'mysql' => 'mysql_connect',
+            'mysqli' => 'mysqli_connect',
+            'oci8' => 'ocilogon',
+            'odbc' => 'odbc_connect',
+            'pgsql' => 'pgsql_connect',
+            'sqlite' => 'sqlite_open',
+            'sybase' => 'sybase_connect'
+            );
+
+        $dsns = array();
+        if($prefs_dsn) {
+            $dsns['preferences'] = $prefs_dsn;
+        }
+        if($addrbook_dsn) {
+            $dsns['addressbook'] = $addrbook_dsn;
+        }
+        if($addrbook_global_dsn) {
+            $dsns['global addressbook'] = $addrbook_global_dsn;
+        }
+
+        foreach($dsns as $type => $dsn) {
+            $dbtype = array_shift(explode(':', $dsn));
+            if(isset($db_functions[$dbtype]) && function_exists($db_functions[$dbtype])) {
+                echo "$IND$dbtype database support present.<br />\n";
+
+                // now, test this interface:
+
+                $dbh = DB::connect($dsn, true);
+                if (DB::isError($dbh)) {
+                    do_err('Database error: '. htmlspecialchars(DB::errorMessage($dbh)) .
+                        ' in ' .$type .' DSN.');
+                }
+                $dbh->disconnect();
+                echo "$IND$type database connect successful.<br />\n";
+
+            } else {
+                do_err($db.' database support not present!');
             }
-	} else {
-	    do_err('Required PHP PEAR DB support is not available. Is PEAR installed and is the
-	    	include path set correctly to find <tt>DB.php</tt>? The include path is now:
-		"<tt>' . ini_get('include_path') . '</tt>".');
-	}
+        }
+    } else {
+        do_err('Required PHP PEAR DB support is not available. Is PEAR installed and is the
+            include path set correctly to find <tt>DB.php</tt>? The include path is now:
+            "<tt>' . ini_get('include_path') . '</tt>".');
+    }
 } else {
     echo $IND."not using database functionality.<br />\n";
 }
@@ -338,18 +345,18 @@ if($addrbook_dsn || $prefs_dsn || $addrbook_global_dsn) {
 // LDAP DB tests
 echo "Checking LDAP functions...<br />\n";
 if( empty($ldap_server) ) {
-	echo $IND."not using LDAP functionality.<br />\n";
+    echo $IND."not using LDAP functionality.<br />\n";
 } else {
     if ( !function_exists(ldap_connect) ) {
         do_err('Required LDAP support is not available.');
     } else {
-		echo "$IND LDAP support present.<br />\n";
+        echo "$IND LDAP support present.<br />\n";
         foreach ( $ldap_server as $param ) {
 
             $linkid = ldap_connect($param['host'], (empty($param['port']) ? 389 : $param['port']) );
 
             if ( $linkid ) {
-		        echo "$IND LDAP connect to ".$param['host']." successful: ".$linkid."<br />\n";
+               echo "$IND LDAP connect to ".$param['host']." successful: ".$linkid."<br />\n";
                 
                 if ( !empty($param['protocol']) &&
                      !ldap_set_option($linkid, LDAP_OPT_PROTOCOL_VERSION, $param['protocol']) ) {
@@ -385,3 +392,4 @@ if( empty($ldap_server) ) {
 </html>
 <?php
 // vim: et ts=4
+?>
\ No newline at end of file
diff --git a/src/delete_message.php b/src/delete_message.php
index f2791eea..b876be57 100644
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -48,10 +48,10 @@ if (sqGetGlobalVar('what', $tmp, SQ_FORM)) {
     $what = urlencode($tmp);
 }
 if (sqGetGlobalVar('sort', $tmp, SQ_FORM)) {
-	$sort = (int) $tmp;
+    $sort = (int) $tmp;
 }
 if (sqGetGlobalVar('startMessage', $tmp, SQ_FORM)) {
-	$startMessage = (int) $tmp;
+    $startMessage = (int) $tmp;
 }
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
@@ -87,4 +87,4 @@ if (isset($where) && isset($what)) {
 
 sqimap_logout($imapConnection);
 
-?>
+?>
\ No newline at end of file
diff --git a/src/download.php b/src/download.php
index 12e508a4..bf680771 100644
--- a/src/download.php
+++ b/src/download.php
@@ -156,4 +156,4 @@ if (isset($absolute_dl) && $absolute_dl) {
 mime_print_body_lines ($imapConnection, $passed_id, $ent_id, $encoding);
 $mailbox_cache[$aMailbox['NAME']] = $aMailbox;
 sqsession_register($mailbox_cache,'mailbox_cache');
-?>
+?>
\ No newline at end of file
diff --git a/src/empty_trash.php b/src/empty_trash.php
index 3b6a315a..415e35ec 100644
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -73,4 +73,4 @@ $location = get_location();
 header ("Location: $location/left_main.php");
 
 sqimap_logout($imap_stream);
-?>
+?>
\ No newline at end of file
diff --git a/src/folders.php b/src/folders.php
index b9d959db..c35e3268 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -159,32 +159,31 @@ if ($save_as_draft) {
 // What if move_to_sent = false and $sent_folder is set? Should it still be skipped?
 
 for ($p = 0, $cnt = count($boxes); $p < $cnt && $count_special_folders < $num_max; $p++) {
-    switch ($boxes[$p]['unformatted'])
-    {
-       case (strtoupper($boxes[$p]['unformatted']) == 'INBOX'):
-          ++$count_special_folders;
-	  $skip_folders[] = $boxes[$p]['unformatted'];
-	  break;
-       // FIX ME inbox.trash should be set in conf.pl
-       case 'inbox.trash':
-          if (strtolower($imap_server_type) == 'courier') {
-	      ++$count_special_folders;
-	  }
-	  break;
-       case $trash_folder:
-           ++$count_special_folders;
-           $skip_folders[] = $trash_folder;
-	   break;
-       case $sent_folder:
-           ++$count_special_folders;
-           $skip_folders[] = $sent_folder;
-	   break;
-       case $draft_folder:
-           ++$count_special_folders;
-           $skip_folders[] = $draft_folder;
-	   break;
-       default: break;
-    }	  
+    switch ($boxes[$p]['unformatted']) {
+        case (strtoupper($boxes[$p]['unformatted']) == 'INBOX'):
+            ++$count_special_folders;
+            $skip_folders[] = $boxes[$p]['unformatted'];
+            break;
+        // FIX ME inbox.trash should be set in conf.pl
+        case 'inbox.trash':
+            if (strtolower($imap_server_type) == 'courier') {
+                ++$count_special_folders;
+            }
+            break;
+        case $trash_folder:
+            ++$count_special_folders;
+            $skip_folders[] = $trash_folder;
+            break;
+        case $sent_folder:
+            ++$count_special_folders;
+            $skip_folders[] = $sent_folder;
+            break;
+        case $draft_folder:
+            ++$count_special_folders;
+            $skip_folders[] = $draft_folder;
+            break;
+        default: break;
+    }
 }
 
 
@@ -330,15 +329,11 @@ if(!$no_list_for_subscribe) {
 
 do_hook('folders_bottom');
 ?>
-
     </td></tr>
     </table>
-
 </td></tr>
 </table>
-
 <?php
    sqimap_logout($imapConnection);
 ?>
-
 </body></html>
diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php
index 156c18ac..73ffb61b 100644
--- a/src/folders_subscribe.php
+++ b/src/folders_subscribe.php
@@ -46,7 +46,7 @@ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0
 if ($method == 'sub') {
     if($no_list_for_subscribe && $imap_server_type == 'cyrus') {
        /* Cyrus, atleast, does not typically allow subscription to
-	* nonexistent folders (this is an optional part of IMAP),
+        * nonexistent folders (this is an optional part of IMAP),
         * lets catch it here and report back cleanly. */
        if(!sqimap_mailbox_exists($imapConnection, $mailbox[0])) {
           header("Location: $location/folders.php?success=subscribe-doesnotexist");
@@ -70,4 +70,4 @@ if ($method == 'sub') {
 sqimap_logout($imapConnection);
 header("Location: $location/folders.php?success=$success");
 
-?>
+?>
\ No newline at end of file
diff --git a/src/help.php b/src/help.php
index 8e59f318..29df95cc 100644
--- a/src/help.php
+++ b/src/help.php
@@ -82,13 +82,13 @@ function get_info($doc, $pos) {
                 $ary[1] = $ary[0];
                 $ary[2] = $ary[0];
             }
-	    return( $ary );
+            return( $ary );
         } else if (!trim(strtolower($doc[$n]))) {
-	     $ary[0] = '';
-	     $ary[1] = '';
-	     $ary[2] = '';
-	     $ary[3] = $n;
-	}
+            $ary[0] = '';
+            $ary[1] = '';
+            $ary[2] = '';
+            $ary[3] = $n;
+        }
     }
     $ary[0] = _("ERROR: Help files are not in the right format!");
     $ary[1] = $ary[0];
@@ -152,9 +152,9 @@ if ( sqgetGlobalVar('chapter', $temp, SQ_GET) ) {
 
 if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
     echo html_tag( 'table', '', 'center', '', 'cellpadding="0" cellspacing="0" border="0"' ) .
-	        html_tag( 'tr' ) .
-                    html_tag( 'td' ) .
-                         '<b><center>' . _("Table of Contents") . '</center></b><br />';
+         html_tag( 'tr' ) .
+         html_tag( 'td' ) .
+         '<b><center>' . _("Table of Contents") . '</center></b><br />';
     echo html_tag( 'ol' );
     for ($i=0, $cnt = count($helpdir); $i < $cnt; $i++) {
         $doc = file("../help/$user_language/$helpdir[$i]");
@@ -200,7 +200,7 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
         $help_info = get_info($doc, $n);
         echo "<b>$chapter.$section - $help_info[0]</b>" .
             html_tag( 'ul', $help_info[1] );
-    	$n = $help_info[3];
+        $n = $help_info[3];
     }
 
     echo '<br /><center><a href="#pagetop">' . _("Top") . '</a></center>';
@@ -210,6 +210,6 @@ do_hook('help_bottom');
 
 echo html_tag( 'tr',
             html_tag( 'td', '&nbsp;', 'left', $color[0] )
-        ).
-        '</table></body></html>';
-?>
\ No newline at end of file
+        );
+?>
+</table></body></html>
\ No newline at end of file
diff --git a/src/left_main.php b/src/left_main.php
index 9a1d4beb..f7a8ecfc 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -52,10 +52,10 @@ function formatMailboxName($imapConnection, $box_array) {
     $status = array('','');
     if (($unseen_notify == 2 && $real_box == 'INBOX') ||
         $unseen_notify == 3) {
-    $tmp_status = create_unseen_string($real_box, $box_array, $imapConnection, $unseen_type );
-    if ($status !== false) {
-        $status = $tmp_status;
-    }
+            $tmp_status = create_unseen_string($real_box, $box_array, $imapConnection, $unseen_type );
+            if ($status !== false) {
+                $status = $tmp_status;
+            }
     }
     list($unseen_string, $unseen) = $status;
     $special_color = ($use_special_folder_color && isSpecialMailbox($real_box));
@@ -68,8 +68,8 @@ function formatMailboxName($imapConnection, $box_array) {
 
     /* Create the link for this folder. */
     if ($status !== false) {
-    $line .= '<a href="right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox='.
-                $mailboxURL.'" target="right" style="text-decoration:none">';
+        $line .= '<a href="right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox='.
+                 $mailboxURL.'" target="right" style="text-decoration:none">';
     }
     if ($special_color) {
         $line .= "<font color=\"$color[11]\">";
@@ -82,7 +82,7 @@ function formatMailboxName($imapConnection, $box_array) {
     if ($special_color == TRUE)
         $line .= '</font>';
     if ($status !== false) {
-    $line .= '</a>';
+        $line .= '</a>';
     }
 
     /* If there are unseen message, close bolding. */
@@ -225,7 +225,7 @@ function create_unseen_string($boxName, $boxArray, $imapConnection, $unseen_type
     $status = sqimap_status_messages($imapConnection, $boxName);
     $boxUnseenCount = $status['UNSEEN'];
     if ($boxUnseenCount === false) {
-    return false;
+        return false;
     }
     if ($unseen_type == 2) {
         $boxMessageCount = $status['MESSAGES'];
@@ -245,10 +245,10 @@ function create_unseen_string($boxName, $boxArray, $imapConnection, $unseen_type
 
             /* Collect the counts for this subfolder. */
             if (($boxName != $boxes[$i]['unformatted'])
-                   && (substr($boxes[$i]['unformatted'], 0, $curBoxLength) == $boxName)
-                   && !in_array('noselect', $boxes[$i]['flags'])) {
-        $status = sqimap_status_messages($imapConnection, $boxes[$i]['unformatted']);
-        $subUnseenCount = $status['UNSEEN'];
+                    && (substr($boxes[$i]['unformatted'], 0, $curBoxLength) == $boxName)
+                    && !in_array('noselect', $boxes[$i]['flags'])) {
+                $status = sqimap_status_messages($imapConnection, $boxes[$i]['unformatted']);
+                $subUnseenCount = $status['UNSEEN'];
                 if ($unseen_type == 2) {
                     $subMessageCount = $status['MESSAGES'];;
                 }
@@ -447,7 +447,7 @@ function ListBoxes ($boxes, $j=0 ) {
 
 function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
-           $move_to_trash, $trash_folder, $collapse_folders, $use_special_folder_color;
+        $move_to_trash, $trash_folder, $collapse_folders, $use_special_folder_color;
 
     if (!isset($boxes) || empty($boxes))
         return;
@@ -692,7 +692,7 @@ var vTreeSrc;
     function hidechilds(img) {
       id = img.id + ".0000";
       form_id = "mbx[" + img.id +"F]";
-      if (document.all) {	//IE, Opera7
+      if (document.all) { //IE, Opera7
         div = document.all[id];
         if (div) {
            if (div.style.display == "none") {
@@ -707,15 +707,15 @@ var vTreeSrc;
            }
            vTreeImg = img;
            vTreeDiv = div;
-           if (typeof vTreeDiv.readyState != "undefined")	//IE
+           if (typeof vTreeDiv.readyState != "undefined") //IE
               setTimeout("fTreeTimeout()",100);
-           else	//Non IE
+           else //Non IE
               vTreeImg.src = vTreeSrc;
            div.style.display = style;
            document.all[form_id].value = value;
         }
       }
-      else if (document.getElementById) {	//Gecko
+      else if (document.getElementById) { //Gecko
         div = document.getElementById(id);
         if (div) {
            if (div.style.display == "none") {
@@ -757,29 +757,29 @@ $xtra .= "      left_size = \"$left_size\";\n";
 $xtra .= <<<ECHO
       if (document.all) {
         masterf = window.parent.document.all["fs1"];
-    leftf = window.parent.document.all["left"];
-    leftcontent = document.all["leftframe"];
-    leftbutton = document.all["showf"];
+        leftf = window.parent.document.all["left"];
+        leftcontent = document.all["leftframe"];
+        leftbutton = document.all["showf"];
       } else if (document.getElementById) {
-    masterf = window.parent.document.getElementById("fs1");
-    leftf = window.parent.document.getElementById("left");
-    leftcontent = document.getElementById("leftframe");
-    leftbutton = document.getElementById("showf");
+        masterf = window.parent.document.getElementById("fs1");
+        leftf = window.parent.document.getElementById("left");
+        leftcontent = document.getElementById("leftframe");
+        leftbutton = document.getElementById("showf");
       } else {
         return false;
       }
       if(hide) {
          new_col = calc_col("20");
          masterf.cols = new_col;
-     document.body.scrollLeft=0;
-     document.body.style.overflow='hidden';
-     leftcontent.style.display = 'none';
-     leftbutton.style.display='block';
+         document.body.scrollLeft=0;
+         document.body.style.overflow='hidden';
+         leftcontent.style.display = 'none';
+         leftbutton.style.display='block';
       } else {
          masterf.cols = calc_col(left_size);
-     document.body.style.overflow='';
-     leftbutton.style.display='none';
-     leftcontent.style.display='block';
+         document.body.style.overflow='';
+         leftbutton.style.display='none';
+         leftcontent.style.display='block';
 
       }
    }
@@ -806,7 +806,7 @@ $xtra .= <<<ECHO
      if (document.all) {
         masterf = window.parent.document.all["fs1"];
      } else if (document.getElementById) {
-    window.parent.document.getElementById("fs1");
+        window.parent.document.getElementById("fs1");
      } else {
         return false;
      }
@@ -946,12 +946,13 @@ if ($auto_create_special && !isset($auto_create_done)) {
     sqsession_register($auto_create_done, 'auto_create_done');
 }
 
-if ($advanced_tree)
-  echo "\n<body" .
-	' onload="preload(\'../images/minus.png\',\'../images/plus.png\')"' .
-  " bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
-else
-  echo "\n<body bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
+if ($advanced_tree) {
+    echo "\n<body" .
+            ' onload="preload(\'../images/minus.png\',\'../images/plus.png\')"' .
+            " bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
+} else {
+    echo "\n<body bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
+}
 
 do_hook('left_main_before');
 if ($advanced_tree) {
@@ -989,8 +990,8 @@ if ($date_format != 6) {
 
     switch( $date_format ) {
     case 0:
-	$clk = date('Y-m-d '.$hr. ' T', time());
-	break;
+        $clk = date('Y-m-d '.$hr. ' T', time());
+        break;
     case 1:
         $clk = date('m/d/y '.$hr, time());
         break;
diff --git a/src/login.php b/src/login.php
index e459c0aa..9baeccbe 100644
--- a/src/login.php
+++ b/src/login.php
@@ -154,7 +154,7 @@ echo html_tag( 'table',
                                     _("Name:") ,
                                 'right', '', 'width="30%"' ) .
                                 html_tag( 'td',
-				    addInput($username_form_name, $loginname_value),
+                                    addInput($username_form_name, $loginname_value),
                                 'left', '', 'width="*"' )
                                 ) . "\n" .
                             html_tag( 'tr',
@@ -162,10 +162,10 @@ echo html_tag( 'table',
                                     _("Password:") ,
                                 'right', '', 'width="30%"' ) .
                                 html_tag( 'td',
-				    addPwField($password_form_name).
-				    addHidden('js_autodetect_results', SMPREF_JS_OFF).
+                                    addPwField($password_form_name).
+                                    addHidden('js_autodetect_results', SMPREF_JS_OFF).
                                     $rcptaddress .
-				    addHidden('just_logged_in', '1'),
+                                    addHidden('just_logged_in', '1'),
                                 'left', '', 'width="*"' )
                             ) ,
                         'center', $color[4], 'border="0" width="100%"' ) ,
@@ -184,6 +184,5 @@ do_hook('login_form');
 echo '</form>' . "\n";
 
 do_hook('login_bottom');
-echo "</body>\n".
-     "</html>\n";
-?>
\ No newline at end of file
+?>
+</body></html>
\ No newline at end of file
diff --git a/src/mailto.php b/src/mailto.php
index 0446446c..c776afcf 100644
--- a/src/mailto.php
+++ b/src/mailto.php
@@ -80,4 +80,4 @@ if($force_login == false && sqsession_is_registered('user_is_logged_in')) {
 
 session_write_close();
 header('Location: ' . get_location() . '/' . $redirect);
-?>
+?>
\ No newline at end of file
diff --git a/src/options_highlight.php b/src/options_highlight.php
index c6d558d5..33de157d 100644
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -82,7 +82,7 @@ if (isset($theid) && ($action == 'delete') ||
             $new_rules = $message_highlight_list;
             break;
     }
-    $message_highlight_list = $new_rules;    
+    $message_highlight_list = $new_rules;
 
     setPref($data_dir, $username, 'hililist', serialize($message_highlight_list));
 
@@ -386,29 +386,29 @@ if ($action == 'edit' || $action == 'add') {
     echo '         '.addRadioBox('color_type', $selected_choose, '1');
 
     $selops = array (
-    	$color_list[0] => _("Dark Blue"),
-	$color_list[1] => _("Dark Green"),
-	$color_list[2] => _("Dark Yellow"),
-	$color_list[3] => _("Dark Cyan"),
-	$color_list[4] => _("Dark Magenta"),
-	$color_list[5] => _("Light Blue"),
-	$color_list[6] => _("Light Green"),
-	$color_list[7] => _("Light Yellow"),
-	$color_list[8] => _("Light Cyan"),
-	$color_list[9] => _("Light Magenta"),
-	$color_list[10] => _("Dark Gray"),
-	$color_list[11] => _("Medium Gray"),
-	$color_list[12] => _("Light Gray"),
-	$color_list[13] => _("White") );
-	
+        $color_list[0] => _("Dark Blue"),
+        $color_list[1] => _("Dark Green"),
+        $color_list[2] => _("Dark Yellow"),
+        $color_list[3] => _("Dark Cyan"),
+        $color_list[4] => _("Dark Magenta"),
+        $color_list[5] => _("Light Blue"),
+        $color_list[6] => _("Light Green"),
+        $color_list[7] => _("Light Yellow"),
+        $color_list[8] => _("Light Cyan"),
+        $color_list[9] => _("Light Magenta"),
+        $color_list[10] => _("Dark Gray"),
+        $color_list[11] => _("Medium Gray"),
+        $color_list[12] => _("Light Gray"),
+        $color_list[13] => _("White") );
+
     echo addSelect('newcolor_choose', $selops, $selected_i, TRUE);
     echo "<br />\n";
 
     echo '         '.addRadioBox('color_type', $selected_input, 2).
         ' &nbsp;'. _("Other:") .
-	addInput('newcolor_input',
-	    (($selected_input && isset($theid)) ? $message_highlight_list[$theid]['color'] : ''),
-	    '7');
+        addInput('newcolor_input',
+            (($selected_input && isset($theid)) ? $message_highlight_list[$theid]['color'] : ''),
+            '7');
     echo _("Ex: 63aa7f")."<br />\n";
     echo "      </td>\n";
     echo "   </tr>\n";
@@ -424,7 +424,7 @@ if ($action == 'edit' || $action == 'add') {
         $gridindex = "$y,$x";
         $gridcolor = $new_color_list[$gridindex];
         echo html_tag( 'td', addRadioBox('color_type', ($gridcolor == $current_color), '#'.$gridcolor),
-	    'left', $gridcolor, 'colspan="2"' );
+            'left', $gridcolor, 'colspan="2"' );
         }
         echo "</tr>\n";
     }
diff --git a/src/options_order.php b/src/options_order.php
index 1512a93b..56c8340a 100644
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -127,7 +127,7 @@ displayPageHeader($color, 'None');
     
     if (count($index_order) != count($available)) {
 
-	$opts = array();
+        $opts = array();
         for ($i=1; $i <= count($available); $i++) {
             $found = false;
             for ($j=1; $j <= count($index_order); $j++) {
@@ -136,14 +136,14 @@ displayPageHeader($color, 'None');
                 }
             }
             if (!$found) {
-	        $opts[$i] = $available[$i];
+                $opts[$i] = $available[$i];
             }
         }
-	
+
         echo addForm('options_order.php', 'post', 'f');
-	echo addSelect('add', $opts, '', TRUE);
+        echo addSelect('add', $opts, '', TRUE);
         echo addHidden('method', 'add');
-	echo addSubmit(_("Add"), 'submit');
+        echo addSubmit(_("Add"), 'submit');
         echo '</form>';
     }
  
diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index d1139de9..7e022754 100644
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -178,11 +178,11 @@ function pf_clean_string ( $unclean_string, $num_leading_spaces ) {
         }
         else
         {
-	    $i = strrpos( $this_line, ' ');
-    	    $clean_string .= substr( $this_line, 0, $i);
-    	    $clean_string .= "\n" . $leading_spaces;
-    	    $unclean_string = substr($unclean_string, 1+$i);
-	}
+            $i = strrpos( $this_line, ' ');
+            $clean_string .= substr( $this_line, 0, $i);
+            $clean_string .= "\n" . $leading_spaces;
+            $unclean_string = substr($unclean_string, 1+$i);
+        }
     }
     $clean_string .= $unclean_string;
 
diff --git a/src/read_body.php b/src/read_body.php
index e07ab9db..faed6afa 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * read_body.php
  *
@@ -302,7 +303,7 @@ function ClearAttachments() {
             if ($info['session'] == -1) {
                 $attached_file = "$hashed_attachment_dir/$info[localfilename]";
                 if (file_exists($attached_file)) {
-                        unlink($attached_file);
+                    unlink($attached_file);
                 }
             } else {
                 $rem_attachments[] = $info;
@@ -369,9 +370,9 @@ function formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message,
                          $color, $FirstTimeSee) {
     global $msn_user_support, $default_use_mdn, $default_use_priority,
            $show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on,
-	   $squirrelmail_language;
+           $squirrelmail_language;
 
-    $mailbox = $aMailbox['NAME']	;
+    $mailbox = $aMailbox['NAME'];
 
     $header = $message->rfc822_header;
     $env = array();
@@ -849,7 +850,7 @@ $header = $message->header;
 if (isset($sendreceipt)) {
    if ( !$message->is_mdnsent ) {
       $final_recipient = '';
-      if ((isset($identity)) && ($identity != 0))	//Main identity
+      if ((isset($identity)) && ($identity != 0)) //Main identity
          $final_recipient = trim(getPref($data_dir, $username, 'email_address' . $identity, '' ));
       if ($final_recipient == '' )
          $final_recipient = trim(getPref($data_dir, $username, 'email_address', '' ));
@@ -955,5 +956,4 @@ sqimap_logout($imapConnection);
 $mailbox_cache[$aMailbox['NAME']] = $aMailbox;
 sqsession_register($mailbox_cache,'mailbox_cache');
 ?>
-</body>
-</html>
+</body></html>
diff --git a/src/redirect.php b/src/redirect.php
index 963ce226..a071a71c 100644
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -50,7 +50,7 @@ sqsession_register ($base_uri, 'base_uri');
 sqGetGlobalVar('login_username', $login_username);
 sqGetGlobalVar('secretkey', $secretkey);
 if(!sqGetGlobalVar('squirrelmail_language', $squirrelmail_language) || $squirrelmail_language == '') {
-	$squirrelmail_language = $squirrelmail_default_language;
+    $squirrelmail_language = $squirrelmail_default_language;
 }
 if (!sqgetGlobalVar('mailto', $mailto)) {
     $mailto = '';
@@ -176,4 +176,4 @@ function attachment_common_parse($str, $debug) {
     sqsession_register($attachment_common_types, 'attachment_common_types');
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/src/right_main.php b/src/right_main.php
index 5ce2ba2f..00a166e1 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * right_main.php
  *
diff --git a/src/search.php b/src/search.php
index f14484e1..9e050fd2 100644
--- a/src/search.php
+++ b/src/search.php
@@ -1,39 +1,39 @@
 <?php
 
 /**
-* search.php
-*
-* Copyright (c) 1999-2004 The SquirrelMail Project Team
-* Licensed under the GNU GPL. For full terms see the file COPYING.
-*
-* IMAP search page
-*
-* Subfolder search idea from Patch #806075 by Thomas Pohl xraven at users.sourceforge.net. Thanks Thomas!
-*
-* @version $Id$
-* @package squirrelmail
-* @link http://www.ietf.org/rfc/rfc3501.txt
-* @author Alex Lemaresquier - Brainstorm - alex at brainstorm.fr
-*/
+ * search.php
+ *
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * IMAP search page
+ *
+ * Subfolder search idea from Patch #806075 by Thomas Pohl xraven at users.sourceforge.net. Thanks Thomas!
+ *
+ * @version $Id$
+ * @package squirrelmail
+ * @link http://www.ietf.org/rfc/rfc3501.txt
+ * @author Alex Lemaresquier - Brainstorm - alex at brainstorm.fr
+ */
 
 /**
-* Path for SquirrelMail required files.
-* @ignore
-*/
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
 define('SM_PATH','../');
 
 /** SquirrelMail required files.
-*/
+ */
 require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'functions/imap_asearch.php');
 require_once(SM_PATH . 'functions/imap_mailbox.php');
 require_once(SM_PATH . 'functions/imap_messages.php');
 require_once(SM_PATH . 'functions/mime.php');
-require_once(SM_PATH . 'functions/mailbox_display.php');	//getButton()...
+require_once(SM_PATH . 'functions/mailbox_display.php'); //getButton()...
 
 /** Prefs array ordinals. Must match $recent_prefkeys and $saved_prefkeys
-*/
+ */
 define('ASEARCH_WHERE', 0);
 define('ASEARCH_MAILBOX', 1);
 define('ASEARCH_WHAT', 2);
@@ -44,12 +44,12 @@ define('ASEARCH_SUB', 6);
 define('ASEARCH_MAX', 7);
 
 /** Name of session var
-*/
+ */
 define('ASEARCH_CRITERIA', 'criteria');
 
 /** Builds a href with params
-* @param string $params optional parameters to GET
-*/
+ * @param string $params optional parameters to GET
+ */
 function asearch_get_href($params = '')
 {
     $href = 'search.php';
@@ -59,10 +59,10 @@ function asearch_get_href($params = '')
 }
 
 /** Builds a [link]
-* @param string $href (reference)
-* @param string $text
-* @param string $title
-*/
+ * @param string $href (reference)
+ * @param string $text
+ * @param string $title
+ */
 function asearch_get_link(&$href, $text, $title = '')
 {
     if ($title != '')
@@ -71,30 +71,30 @@ function asearch_get_link(&$href, $text, $title = '')
 }
 
 /** Builds a toggle [link]
-* @param integer $value
-* @param string $action
-* @param array $text_array
-* @param array $title_array
-*/
+ * @param integer $value
+ * @param string $action
+ * @param array $text_array
+ * @param array $title_array
+ */
 function asearch_get_toggle_link($value, $action, $text_array, $title_array = array())
 {
     return asearch_get_link(asearch_get_href($action . '=' . (int)$value), $text_array[$value], asearch_nz($title_array[$value]));
 }
 
 /**
-* @param string $a
-* @param string $b
-* @return bool strcoll()-like result
-*/
+ * @param string $a
+ * @param string $b
+ * @return bool strcoll()-like result
+ */
 function asearch_unhtml_strcoll($a, $b)
 {
     return strcoll(asearch_unhtmlentities($a), asearch_unhtmlentities($b));
 }
 
 /**
-* @param string $mailbox mailbox name utf7 encoded inc. special case INBOX
-* @return string mailbox name ready to display (utf7 decoded or localized INBOX)
-*/
+ * @param string $mailbox mailbox name utf7 encoded inc. special case INBOX
+ * @return string mailbox name ready to display (utf7 decoded or localized INBOX)
+ */
 function imap_get_mailbox_display($mailbox)
 {
     if (strtoupper($mailbox) == 'INBOX')
@@ -103,9 +103,9 @@ function imap_get_mailbox_display($mailbox)
 }
 
 /**
-* @param string $mailbox mailbox name or special case 'All Folders'
-* @return string mailbox name ready to display (utf7 decoded or localized 'All Folders')
-*/
+ * @param string $mailbox mailbox name or special case 'All Folders'
+ * @return string mailbox name ready to display (utf7 decoded or localized 'All Folders')
+ */
 function asearch_get_mailbox_display($mailbox)
 {
     if ($mailbox == 'All Folders')
@@ -114,29 +114,29 @@ function asearch_get_mailbox_display($mailbox)
 }
 
 /**
-* @param array $color color array
-* @param string $txt text to display
-* @return string title ready to display
-*/
+ * @param array $color color array
+ * @param string $txt text to display
+ * @return string title ready to display
+ */
 function asearch_get_title_display(&$color, $txt)
 {
     return '<b><big>' . $txt . '</big></b>';
 }
 
 /**
-* @param array $color color array
-* @param string $txt text to display
-* @return string error text ready to display
-*/
+ * @param array $color color array
+ * @param string $txt text to display
+ * @return string error text ready to display
+ */
 function asearch_get_error_display(&$color, $txt)
 {
     return '<font color="' . $color[2] . '">' . '<b><big>' . $txt . '</big></b></font>';
 }
 
 /**
-* @param array $input_array array to serialize
-* @return string a string containing a byte-stream representation of value that can be stored anywhere
-*/
+ * @param array $input_array array to serialize
+ * @return string a string containing a byte-stream representation of value that can be stored anywhere
+ */
 function asearch_serialize(&$input_array)
 {
     global $search_advanced;
@@ -146,9 +146,9 @@ function asearch_serialize(&$input_array)
 }
 
 /**
-* @param string $input_string string to unserialize
-* @return array
-*/
+ * @param string $input_string string to unserialize
+ * @return array
+ */
 function asearch_unserialize($input_string)
 {
     global $search_advanced;
@@ -158,11 +158,11 @@ function asearch_unserialize($input_string)
 }
 
 /**
-* @param string $key the pref key
-* @param integer $index the pref key index
-* @param string $default default value
-* @return string pref value
-*/
+ * @param string $key the pref key
+ * @param integer $index the pref key index
+ * @param string $default default value
+ * @return string pref value
+ */
 function asearch_getPref(&$key, $index, $default = '')
 {
     global $data_dir, $username, $search_advanced;
@@ -170,11 +170,11 @@ function asearch_getPref(&$key, $index, $default = '')
 }
 
 /**
-* @param string $key the pref key
-* @param integer $index the pref key index
-* @param string $value pref value to set
-* @return bool status
-*/
+ * @param string $key the pref key
+ * @param integer $index the pref key index
+ * @param string $value pref value to set
+ * @return bool status
+ */
 function asearch_setPref(&$key, $index, $value)
 {
     global $data_dir, $username, $search_advanced;
@@ -182,10 +182,10 @@ function asearch_setPref(&$key, $index, $value)
 }
 
 /**
-* @param string $key the pref key
-* @param integer $index the pref key index
-* @return bool status
-*/
+ * @param string $key the pref key
+ * @param integer $index the pref key index
+ * @return bool status
+ */
 function asearch_removePref(&$key, $index)
 {
     global $data_dir, $username, $search_advanced;
@@ -193,7 +193,7 @@ function asearch_removePref(&$key, $index)
 }
 
 /** Sanity checks, done before running the imap command and before calling push_recent
-*/
+ */
 function asearch_check_query(&$where_array, &$what_array, &$exclude_array)
 {
     global $imap_asearch_opcodes;
@@ -212,7 +212,7 @@ function asearch_check_query(&$where_array, &$what_array, &$exclude_array)
 }
 
 /** Read the recent searches from the prefs
-*/
+ */
 function asearch_read_recent()
 {
     global $recent_prefkeys, $search_memory;
@@ -222,14 +222,14 @@ function asearch_read_recent()
     for ($pref_num = 0; $pref_num < $search_memory; $pref_num++) {
         foreach ($recent_prefkeys as $prefkey) {
             $pref = asearch_getPref($prefkey, $pref_num);
-/*			if (!empty($pref))*/
+/*            if (!empty($pref))*/
                 $recent_array[$prefkey][$recent_num] = $pref;
         }
         if (empty($recent_array[$recent_prefkeys[0]][$recent_num])) {
             foreach ($recent_prefkeys as $key) {
                 array_pop($recent_array[$key]);
             }
-//			break;	//Disabled to support old search code broken prefs
+//            break; //Disabled to support old search code broken prefs
         }
         else
             $recent_num++;
@@ -238,7 +238,7 @@ function asearch_read_recent()
 }
 
 /** Read the saved searches from the prefs
-*/
+ */
 function asearch_read_saved()
 {
     global $saved_prefkeys;
@@ -259,7 +259,7 @@ function asearch_read_saved()
 }
 
 /** Save a recent search to the prefs
-*/
+ */
 function asearch_save_recent($recent_index)
 {
     global $recent_prefkeys, $saved_prefkeys;
@@ -279,7 +279,7 @@ function asearch_save_recent($recent_index)
 }
 
 /** Write a recent search to prefs
-*/
+ */
 function asearch_write_recent(&$recent_array)
 {
     global $recent_prefkeys, $search_memory;
@@ -298,7 +298,7 @@ function asearch_write_recent(&$recent_array)
 }
 
 /** Remove a recent search from prefs
-*/
+ */
 function asearch_forget_recent($forget_index)
 {
     global $recent_prefkeys;
@@ -311,7 +311,7 @@ function asearch_forget_recent($forget_index)
 }
 
 /** Find a recent search in the prefs (used to avoid saving duplicates)
-*/
+ */
 function asearch_find_recent(&$recent_array, &$mailbox_array, &$biop_array, &$unop_array, &$where_array, &$what_array, &$exclude_array, &$sub_array)
 {
     global $recent_prefkeys, $search_advanced;
@@ -345,7 +345,7 @@ function asearch_find_recent(&$recent_array, &$mailbox_array, &$biop_array, &$un
 }
 
 /** Push a recent search into the prefs
-*/
+ */
 function asearch_push_recent(&$mailbox_array, &$biop_array, &$unop_array, &$where_array, &$what_array, &$exclude_array, &$sub_array)
 {
     global $recent_prefkeys, $search_memory;
@@ -360,7 +360,7 @@ function asearch_push_recent(&$mailbox_array, &$biop_array, &$unop_array, &$wher
     if ($search_memory > 0) {
         $recent_array = asearch_read_recent();
         $recent_found = asearch_find_recent($recent_array, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
-        if ($recent_found >= 0) {	// Remove identical recent
+        if ($recent_found >= 0) { // Remove identical recent
             foreach ($recent_prefkeys as $key) {
                 array_splice($recent_array[$key], $recent_found, 1);
             }
@@ -376,8 +376,8 @@ function asearch_push_recent(&$mailbox_array, &$biop_array, &$unop_array, &$wher
 }
 
 /** Edit a recent search
-* @global array mailbox_array searched mailboxes
-*/
+ * @global array mailbox_array searched mailboxes
+ */
 function asearch_edit_recent($index)
 {
     global $recent_prefkeys, $search_advanced;
@@ -396,8 +396,8 @@ function asearch_edit_recent($index)
 }
 
 /** Get last search criteria from session or prefs
-* FIX ME, try to avoid globals
-*/
+ * FIX ME, try to avoid globals
+ */
 function asearch_edit_last($index) {
     if (sqGetGlobalVar(ASEARCH_CRITERIA, $criteria, SQ_SESSION)) {
         global $where_array, $mailbox_array, $what_array, $unop_array;
@@ -420,7 +420,7 @@ function asearch_edit_last($index) {
 }
 
 /** Edit a saved search
-*/
+ */
 function asearch_edit_saved($index)
 {
     global $saved_prefkeys, $search_advanced;
@@ -439,7 +439,7 @@ function asearch_edit_saved($index)
 }
 
 /** Write a saved search to the prefs
-*/
+ */
 function asearch_write_saved(&$saved_array)
 {
     global $saved_prefkeys;
@@ -456,7 +456,7 @@ function asearch_write_saved(&$saved_array)
 }
 
 /** Delete a saved search from the prefs
-*/
+ */
 function asearch_delete_saved($saved_index)
 {
     global $saved_prefkeys;
@@ -470,9 +470,9 @@ function asearch_delete_saved($saved_index)
 }
 
 /** Translate the input date to imap date to local date display,
-* so the user can know if the date is wrong or illegal
-* @return string locally formatted date or error text
-*/
+ * so the user can know if the date is wrong or illegal
+ * @return string locally formatted date or error text
+ */
 function asearch_get_date_display(&$what)
 {
     $what_parts = sqimap_asearch_parse_date($what);
@@ -486,8 +486,8 @@ function asearch_get_date_display(&$what)
 }
 
 /** Translate the query to rough natural display
-* @return string rough natural query ready to display
-*/
+ * @return string rough natural query ready to display
+ */
 function asearch_get_query_display(&$color, &$mailbox_array, &$biop_array, &$unop_array, &$where_array, &$what_array, &$exclude_array, &$sub_array)
 {
     global $imap_asearch_biops_in, $imap_asearch_biops, $imap_asearch_unops, $imap_asearch_options;
@@ -523,7 +523,7 @@ function asearch_get_query_display(&$color, &$mailbox_array, &$biop_array, &$uno
             $where_display = $unop_display . asearch_nz($imap_asearch_options[$where], $where);
             $what_type = $imap_asearch_opcodes[$where];
             $what = $what_array[$crit_num];
-            if ($what_type) {	/* Check opcode parameter */
+            if ($what_type) { /* Check opcode parameter */
                 if ($what == '')
                     $what_display = ' ' . asearch_get_error_display($color, _("(Missing argument)"));
                 else {
@@ -550,8 +550,8 @@ function asearch_get_query_display(&$color, &$mailbox_array, &$biop_array, &$uno
 }
 
 /** Handle the alternate row colors
-* @return string color value
-*/
+ * @return string color value
+ */
 function asearch_get_row_color(&$color, $row_num)
 {
 /*$color_string = ($row_num%2 ? $color[0] : $color[4]);*/
@@ -567,7 +567,7 @@ function asearch_get_row_color(&$color, $row_num)
 }
 
 /** Print a whole query array, recent or saved
-*/
+ */
 function asearch_print_query_array(&$boxes, &$query_array, &$query_keys, &$action_array, $title, $show_pref)
 {
     global $color;
@@ -625,7 +625,7 @@ function asearch_print_query_array(&$boxes, &$query_array, &$query_keys, &$actio
 }
 
 /** Print the saved array
-*/
+ */
 function asearch_print_saved(&$boxes)
 {
     global $saved_prefkeys;
@@ -641,8 +641,8 @@ function asearch_print_saved(&$boxes)
 }
 
 /**
-* Print the recent array
-*/
+ * Print the recent array
+ */
 function asearch_print_recent(&$boxes)
 {
     global $recent_prefkeys, $search_memory;
@@ -658,14 +658,14 @@ function asearch_print_recent(&$boxes)
 }
 
 /** Build an <option> statement
-*/
+ */
 function asearch_opt($val, $sel, $tit)
 {
     return '<option value="' . $val . '"' . ($sel == $val ? ' selected="selected"' : '') . '>' . $tit . '</option>' . "\n";
 }
 
 /** Build a <select> statement from an array
-*/
+ */
 function asearch_opt_array($var_name, $opt_array, $cur_val)
 {
     $output = '<select name="' . $var_name . '">' . "\n";
@@ -676,8 +676,8 @@ function asearch_opt_array($var_name, $opt_array, $cur_val)
 }
 
 /** Verify that a mailbox exists
-* @return bool mailbox exists
-*/
+ * @return bool mailbox exists
+ */
 function asearch_mailbox_exists($mailbox, &$boxes)
 {
     foreach ($boxes as $box) {
@@ -688,7 +688,7 @@ function asearch_mailbox_exists($mailbox, &$boxes)
 }
 
 /** Build the mailbox select
-*/
+ */
 function asearch_get_form_mailbox($imapConnection, &$boxes, $mailbox, $row_num = 0)
 {
     if (($mailbox != 'All Folders') && (!asearch_mailbox_exists($mailbox, $boxes))) {
@@ -704,7 +704,7 @@ function asearch_get_form_mailbox($imapConnection, &$boxes, $mailbox, $row_num =
 }
 
 /** Build the Include subfolders checkbox
-*/
+ */
 function asearch_get_form_sub($sub, $row_num = 0)
 {
     return function_exists('addCheckBox') ? addCheckBox('sub[' . $row_num .']', $sub)
@@ -712,7 +712,7 @@ function asearch_get_form_sub($sub, $row_num = 0)
 }
 
 /** Build the 2 unop and where selects
-*/
+ */
 function asearch_get_form_location($unop, $where, $row_num = 0)
 {
     global $imap_asearch_unops, $imap_asearch_options;
@@ -722,7 +722,7 @@ function asearch_get_form_location($unop, $where, $row_num = 0)
 }
 
 /** Build the what text input
-*/
+ */
 function asearch_get_form_what($what, $row_num = 0)
 {
     return function_exists('addInput') ? addInput('what[' . $row_num . ']', $what, '35')
@@ -730,7 +730,7 @@ function asearch_get_form_what($what, $row_num = 0)
 }
 
 /** Build the Exclude criteria checkbox
-*/
+ */
 function asearch_get_form_exclude($exclude, $row_num = 0)
 {
     return function_exists('addCheckBox') ? addCheckBox('exclude['.$row_num.']', $exclude)
@@ -738,7 +738,7 @@ function asearch_get_form_exclude($exclude, $row_num = 0)
 }
 
 /** Print one advanced form row
-*/
+ */
 function asearch_print_form_row($imapConnection, &$boxes, $mailbox, $biop, $unop, $where, $what, $exclude, $sub, $row_num)
 {
     global $imap_asearch_biops_in;
@@ -749,7 +749,7 @@ function asearch_print_form_row($imapConnection, &$boxes, $mailbox, $biop, $unop
 //Binary operator
     echo html_tag('td', $row_num ?
             asearch_opt_array('biop[' . $row_num . ']', $imap_asearch_biops_in, $biop)
-            : '<b>' . _("In") . '</b>', 'center')	. "\n";
+            : '<b>' . _("In") . '</b>', 'center') . "\n";
 
 //Mailbox list and Include Subfolders
     echo html_tag('td',
@@ -769,7 +769,7 @@ function asearch_print_form_row($imapConnection, &$boxes, $mailbox, $biop, $unop
 }
 
 /** Print the advanced search form
-*/
+ */
 function asearch_print_form($imapConnection, &$boxes, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array)
 {
     global $search_button_html, $add_criteria_button_html, $del_excluded_button_html, $del_all_button_html;
@@ -807,7 +807,7 @@ function asearch_print_form($imapConnection, &$boxes, $mailbox_array, $biop_arra
 }
 
 /** Print one basic form row
-*/
+ */
 function asearch_print_form_row_basic($imapConnection, &$boxes, $mailbox, $biop, $unop, $where, $what, $exclude, $sub, $row_num)
 {
     global $search_button_html;
@@ -831,7 +831,7 @@ function asearch_print_form_row_basic($imapConnection, &$boxes, $mailbox, $biop,
 }
 
 /** Print the basic search form
-*/
+ */
 function asearch_print_form_basic($imapConnection, &$boxes, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array)
 {
     global $color;
@@ -858,7 +858,7 @@ function asearch_print_form_basic($imapConnection, &$boxes, $mailbox_array, $bio
 }
 
 /** Print the $msgs messages from $mailbox mailbox
-*/
+ */
 
 function asearch_print_mailbox_msgs($imapConnection, &$aMailbox, $color)
 {
@@ -913,9 +913,9 @@ function asearch_print_mailbox_msgs($imapConnection, &$aMailbox, $color)
 }
 
 /**
-* @param array $boxes mailboxes array (reference)
-* @return array selectable unformatted mailboxes names
-*/
+ * @param array $boxes mailboxes array (reference)
+ * @return array selectable unformatted mailboxes names
+ */
 function sqimap_asearch_get_selectable_unformatted_mailboxes(&$boxes)
 {
     $mboxes_array = array();
@@ -954,29 +954,29 @@ $del_all_button_html = _("Remove All Criteria");
 $del_all_button_text = asearch_unhtmlentities($del_all_button_html);
 
 /** Maximum number of recent searches to handle
-* Default 0
-* @global integer $search_memory
-*/
+ * Default 0
+ * @global integer $search_memory
+ */
 $search_memory = getPref($data_dir, $username, 'search_memory', 0);
 
 /** Advanced search control
-* - 0 => allow basic interface only
-* - 1 => allow advanced interface only
-* - 2 => allow both
-* Default 2
-*/
+ * - 0 => allow basic interface only
+ * - 1 => allow advanced interface only
+ * - 2 => allow both
+ * Default 2
+ */
 $allow_advanced_search = asearch_nz($allow_advanced_search, 2);
 
 /**
-* Toggle advanced/basic search
-*/
+ * Toggle advanced/basic search
+ */
 if (sqgetGlobalVar('advanced', $search_advanced, SQ_GET)) {
     setPref($data_dir, $username, 'search_advanced', $search_advanced & 1);
 }
 /** If 1, show advanced search interface
-* Default from allow_advanced_search pref
-* @global integer $search_advanced
-*/
+ * Default from allow_advanced_search pref
+ * @global integer $search_advanced
+ */
 if ($allow_advanced_search > 1) {
     $search_advanced = getPref($data_dir, $username, 'search_advanced', 0);
 } else {
@@ -984,13 +984,13 @@ if ($allow_advanced_search > 1) {
 }
 if ($search_advanced) {
 /** Set recent prefkeys according to $search_advanced
-* @global array $recent_prefkeys
-*/
+ * @global array $recent_prefkeys
+ */
     $recent_prefkeys = array('asearch_recent_where', 'asearch_recent_mailbox', 'asearch_recent_what', 'asearch_recent_unop', 'asearch_recent_biop', 'asearch_recent_exclude', 'asearch_recent_sub');
 
 /** Set saved prefkeys according to $search_advanced
-* @global array $saved_prefkeys
-*/
+ * @global array $saved_prefkeys
+ */
     $saved_prefkeys = array('asearch_saved_where', 'asearch_saved_mailbox', 'asearch_saved_what', 'asearch_saved_unop', 'asearch_saved_biop', 'asearch_saved_exclude', 'asearch_saved_sub');
 
 /*$asearch_prefkeys = array('where', 'mailbox', 'what', 'biop', 'unop', 'exclude', 'sub');*/
@@ -1000,28 +1000,28 @@ if ($search_advanced) {
 }
 
 /** How we did enter the form
-* - unset : Enter key, or called from outside (eg read_body)
-* - $search_button_text : Search button
-* - 'Search_no_update' : Search but don't update recent
-* - 'Search_last' : Same as no_update but reload and search last
-* - 'Search_silent' : Same as no_update but only display results
-* - $add_criteria_button_text : Add New Criteria button
-* - $del_excluded_button_text : Remove Excluded Criteria button
-* - $del_all_button_text : Remove All Criteria button
-* - 'save_recent'
-* - 'search_recent'
-* - 'forget_recent'
-* - 'edit_saved'
-* - 'search_saved'
-* - 'delete_saved'
-* @global string $submit
-*/
+ * - unset : Enter key, or called from outside (eg read_body)
+ * - $search_button_text : Search button
+ * - 'Search_no_update' : Search but don't update recent
+ * - 'Search_last' : Same as no_update but reload and search last
+ * - 'Search_silent' : Same as no_update but only display results
+ * - $add_criteria_button_text : Add New Criteria button
+ * - $del_excluded_button_text : Remove Excluded Criteria button
+ * - $del_all_button_text : Remove All Criteria button
+ * - 'save_recent'
+ * - 'search_recent'
+ * - 'forget_recent'
+ * - 'edit_saved'
+ * - 'search_saved'
+ * - 'delete_saved'
+ * @global string $submit
+ */
 if (isset($_GET['submit'])) {
     $submit = strip_tags($_GET['submit']);
 }
 /** Searched mailboxes
-* @global array $mailbox_array
-*/
+ * @global array $mailbox_array
+ */
 if (isset($_GET['mailbox'])) {
     $mailbox_array = $_GET['mailbox'];
     $targetmailbox = $_GET['mailbox'];
@@ -1050,8 +1050,8 @@ $aConfig = array(
                 );
 
 /** Binary operators
-* @global array $biop_array
-*/
+ * @global array $biop_array
+ */
 if (isset($_GET['biop'])) {
     $biop_array = $_GET['biop'];
     if (!is_array($biop_array))
@@ -1060,8 +1060,8 @@ if (isset($_GET['biop'])) {
     $biop_array = array();
 }
 /** Unary operators
-* @global array $unop_array
-*/
+ * @global array $unop_array
+ */
 if (isset($_GET['unop'])) {
     $unop_array = $_GET['unop'];
     if (!is_array($unop_array))
@@ -1070,8 +1070,8 @@ if (isset($_GET['unop'])) {
     $unop_array = array();
 }
 /** Where to search
-* @global array $where_array
-*/
+ * @global array $where_array
+ */
 if (isset($_GET['where'])) {
     $where_array = $_GET['where'];
     if (!is_array($where_array)) {
@@ -1081,8 +1081,8 @@ if (isset($_GET['where'])) {
     $where_array = array();
 }
 /** What to search
-* @global array $what_array
-*/
+ * @global array $what_array
+ */
 if (isset($_GET['what'])) {
     $what_array = $_GET['what'];
     if (!is_array($what_array)) {
@@ -1092,28 +1092,28 @@ if (isset($_GET['what'])) {
     $what_array = array();
 }
 /** Whether to exclude this criteria from search
-* @global array $exclude_array
-*/
+ * @global array $exclude_array
+ */
 if (isset($_GET['exclude'])) {
     $exclude_array = $_GET['exclude'];
 } else {
     $exclude_array = array();
 }
 /** Search within subfolders
-* @global array $sub_array
-*/
+ * @global array $sub_array
+ */
 if (isset($_GET['sub'])) {
     $sub_array = $_GET['sub'];
 } else {
     $sub_array = array();
 }
 /** Row number used by recent and saved stuff
-*/
+ */
 if (isset($_GET['rownum'])) {
     $submit_rownum = strip_tags($_GET['rownum']);
 }
 /** Change global sort
-*/
+ */
 if (sqgetGlobalVar('srt', $temp, SQ_GET)) {
     $srt = (int) $temp;
     asearch_edit_last(1);
@@ -1150,21 +1150,21 @@ if (sqgetGlobalVar('moveButton',      $moveButton,      SQ_POST) ||
 
 
 /** Toggle show/hide saved searches
-*/
+ */
 if (sqgetGlobalVar('search_show_saved', $search_show_saved, SQ_GET)) {
     setPref($data_dir, $username, 'search_show_saved', $search_show_saved & 1);
 }
 /** Toggle show/hide recent searches
-*/
+ */
 if (sqgetGlobalVar('search_show_recent', $search_show_recent, SQ_GET)) {
     setPref($data_dir, $username, 'search_show_recent', $search_show_recent & 1);
 }
 // end of get globals
 
 /** If TRUE, do not show search interface
-* Default FALSE
-* @global bool $search_silent
-*/
+ * Default FALSE
+ * @global bool $search_silent
+ */
 $search_silent = FALSE;
 
 /*  See how the page was called and fire off correct function  */
@@ -1209,7 +1209,7 @@ if (!isset($submit)) {
             array_splice($unop_array, $delrow, 1);
             array_splice($where_array, $delrow, 1);
             array_splice($what_array, $delrow, 1);
-            /* array_splice($exclude_array, $delrow, 1);*/	/* There is still some php magic that eludes me */
+            /* array_splice($exclude_array, $delrow, 1);*/ /* There is still some php magic that eludes me */
             array_splice($sub_array, $delrow, 1);
         }
         $exclude_array = array();
@@ -1231,7 +1231,7 @@ if (!isset($submit)) {
         asearch_edit_recent($submit_rownum);
         asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
         break;
-      case 'edit_recent':	/* no link to do this, yet */
+      case 'edit_recent': /* no link to do this, yet */
         asearch_edit_recent($submit_rownum);
         break;
       case 'forget_recent':
@@ -1290,7 +1290,7 @@ if ($search_advanced) {
         'TEXT' => _("Header and Body"),
         'TO' => _("Sent To"),
         //'UID' => 'anum',
-/*	'UNANSWERED' => '',
+/*        'UNANSWERED' => '',
         'UNDELETED' => '',
         'UNDRAFT' => '',
         'UNFLAGGED' => '',
@@ -1330,8 +1330,8 @@ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0
 $boxes = sqimap_mailbox_list($imapConnection);
 /* ensure we have a valid default mailbox name */
 $mailbox = asearch_nz($mailbox_array[0]);
-if (($mailbox == '') || ($mailbox == 'None'))	//Workaround for sm quirk IMHO (what if I really have a mailbox called None?)
-    $mailbox = $boxes[0]['unformatted'];	//Usually INBOX ;)
+if (($mailbox == '') || ($mailbox == 'None')) //Workaround for sm quirk IMHO (what if I really have a mailbox called None?)
+    $mailbox = $boxes[0]['unformatted']; //Usually INBOX ;)
 
 if (isset($composenew) && $composenew) {
     $comp_uri = "../src/compose.php?mailbox=" . urlencode($mailbox)
diff --git a/src/vcard.php b/src/vcard.php
index a0994cff..13236266 100644
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -94,8 +94,8 @@ if ($vcard_nice['version'] == '2.1') {
     }
 } else {
     echo '<tr><td align="center">' .
-	sprintf(_("vCard Version %s is not supported. Some information might not be converted correctly."),$vcard_nice['version']) .
-	"</td></tr>\n";
+         sprintf(_("vCard Version %s is not supported. Some information might not be converted correctly."),$vcard_nice['version']) .
+         "</td></tr>\n";
 }
 
 foreach ($vcard_nice as $k => $v) {
@@ -191,10 +191,10 @@ if (isset($vcard_nice['note'])) {
 echo    addSelect('addaddr[label]', $opts, '', TRUE);
 echo    '</td></tr>' .
         '<tr><td colspan="2" align="center">' .
-	addHidden('addaddr[email]', $vcard_nice['email;internet']).
-	addHidden('addaddr[firstname]', $vcard_safe['firstname']).
-	addHidden('addaddr[lastname]', $vcard_safe['lastname']).
-	addSubmit(_("Add to Address Book"), 'addaddr[SUBMIT]').
+        addHidden('addaddr[email]', $vcard_nice['email;internet']).
+        addHidden('addaddr[firstname]', $vcard_safe['firstname']).
+        addHidden('addaddr[lastname]', $vcard_safe['lastname']).
+        addSubmit(_("Add to Address Book"), 'addaddr[SUBMIT]').
         '</td></tr>' .
         '</table>' .
         '</form>' .
diff --git a/src/view_header.php b/src/view_header.php
index 28089fbc..5948f8ac 100644
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -39,25 +39,25 @@ function parse_viewheader($imapConnection,$id, $passed_ent_id) {
     $cnum = 0;
     for ($i=1; $i < count($read); $i++) {
         $line = htmlspecialchars($read[$i]);
-	switch (true) {
-	  case (eregi("^&gt;", $line)):
-            $second[$i] = $line;
-            $first[$i] = '&nbsp;';
-            $cnum++;
-	    break;
-	  case (eregi("^[ |\t]", $line)):
-            $second[$i] = $line;
-            $first[$i] = '';
-	    break;
-	  case (eregi("^([^:]+):(.+)", $line, $regs)):
-            $first[$i] = $regs[1] . ':';
-            $second[$i] = $regs[2];
-            $cnum++;
-	    break;
-	  default:
-            $second[$i] = trim($line);
-            $first[$i] = '';
-	    break;
+        switch (true) {
+            case (eregi("^&gt;", $line)):
+                $second[$i] = $line;
+                $first[$i] = '&nbsp;';
+                $cnum++;
+                break;
+            case (eregi("^[ |\t]", $line)):
+                $second[$i] = $line;
+                $first[$i] = '';
+                break;
+            case (eregi("^([^:]+):(.+)", $line, $regs)):
+                $first[$i] = $regs[1] . ':';
+                $second[$i] = $regs[2];
+                $cnum++;
+                break;
+            default:
+                $second[$i] = trim($line);
+                $first[$i] = '';
+                break;
         }
     }
     for ($i=0; $i < count($second); $i = $j) {
@@ -100,11 +100,12 @@ function view_header($header, $mailbox, $color) {
         array(
             '<table width="99%" cellpadding="2" cellspacing="0" border="0" '.
                 "align=center>\n".'<tr><td>',
-           '<nobr><tt><b>',
-           '</b>',
-           '</tt></nobr>',
-           '</td></tr></table>'."\n" 
-         ) );
+            '<nobr><tt><b>',
+            '</b>',
+            '</tt></nobr>',
+            '</td></tr></table>'."\n" 
+         )
+    );
     echo '</body></html>';
 }
 
diff --git a/src/webmail.php b/src/webmail.php
index d17cd636..8836f1ba 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -77,12 +77,12 @@ $output = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\">\n".
 if ($err==2) {
     echo $output.
          "<body>\n".
-	 "<p>You need to have php4 installed with the multibyte string function \n".
-	 "enabled (using configure option --enable-mbstring).</p>\n".
-	 "<p>System assumed that you accidently switched to Japanese translation \n".
+         "<p>You need to have php4 installed with the multibyte string function \n".
+         "enabled (using configure option --enable-mbstring).</p>\n".
+         "<p>System assumed that you accidently switched to Japanese translation \n".
          "and reverted your language preference to English.</p>\n".
-	 "<p>Please refresh this page in order to use webmail.</p>\n".
-	 "</body></html>";
+         "<p>Please refresh this page in order to use webmail.</p>\n".
+         "</body></html>";
     return;
 }
 
-- 
2.25.1