From aae41ae986d847f7bb15d98f98e16bc65595f215 Mon Sep 17 00:00:00 2001
From: lkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 5 Mar 2000 04:54:42 +0000
Subject: [PATCH] Removed font tags

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@269 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/display_messages.php | 36 ++++++++++-----------
 functions/imap_general.php     |  8 ++---
 functions/mailbox_display.php  | 58 +++++++++++++++++-----------------
 functions/page_header.php      | 14 ++++----
 src/compose.php                | 14 +++-----
 src/download.php               |  4 +--
 src/folders.php                | 36 ++++++++++-----------
 src/folders_create.php         |  3 +-
 src/folders_delete.php         |  3 +-
 src/folders_rename_getname.php |  4 +--
 src/left_main.php              | 25 +++++++--------
 src/login.php                  | 10 ++----
 src/options.php                | 34 --------------------
 src/options_submit.php         |  3 +-
 src/read_body.php              | 28 ++++++----------
 src/signout.php                | 13 ++++----
 16 files changed, 115 insertions(+), 178 deletions(-)

diff --git a/functions/display_messages.php b/functions/display_messages.php
index c73dea1a..1428d0f3 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -14,9 +14,9 @@
       echo "<TABLE COLS=1 WIDTH=75% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
       echo "   <TR>";
       echo "      <TD BGCOLOR=\"$color[0]\">";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><B><CENTER>ERROR</CENTER></B></FONT>";
+      echo "         <B><CENTER>ERROR</CENTER></B>";
       echo "   </TD></TR><TR><TD>";
-      echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>". _("Unknown user or password incorrect.") ."<BR><A HREF=\"login.php\" TARGET=_top>". _("Click here to try again") ."</A>.</FONT></CENTER>";
+      echo "      <CENTER><BR>". _("Unknown user or password incorrect.") ."<BR><A HREF=\"login.php\" TARGET=_top>". _("Click here to try again") ."</A>.</CENTER>";
       echo "   </TD></TR>";
       echo "</TABLE>";
       echo "</BODY></HTML>";
@@ -28,7 +28,7 @@
       echo "<TABLE COLS=1 WIDTH=100% CELLSPACING=0 CELLPADDING=3 NOBORDER BGCOLOR=\"FFFFFF\" ALIGN=CENTER>";
       echo "   <TR>";
       echo "      <TD BGCOLOR=\"$color[0]\">";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><B><CENTER>". _("Welcome to $org_name's WebMail system") ."</CENTER></B></FONT>";
+      echo "         <B><CENTER>". _("Welcome to $org_name's WebMail system") ."</CENTER></B>";
       echo "   <TR><TD BGCOLOR=\"FFFFFF\">";
       echo "      <TABLE COLS=2 WIDTH=90% CELLSPACING=0 CELLPADDING=3 NOBORDER align=\"center\">";
       echo "         <TR>";
@@ -36,11 +36,11 @@
       if (strlen($org_logo) > 3)
          echo "               <IMG SRC=\"$org_logo\">";
       else
-         echo "               <B><FONT FACE=\"Arial,Helvetica\">$org_name</FONT></B>";
-      echo "         <BR><FONT FACE=\"Arial,Helvetica\" SIZE=-1><CENTER>". _("Running SquirrelMail version $version (c) 1999-2000.") ."</CENTER></FONT><BR>";
+         echo "               <B>$org_name</B>";
+      echo "         <BR><CENTER>". _("Running SquirrelMail version $version (c) 1999-2000.") ."</CENTER><BR>";
       echo "            </CENTER></TD></TR><TR>";
       echo "            <TD BGCOLOR=\"FFFFFF\">";
-      echo "               <FONT FACE=\"Arial,Helvetica\">$motd</FONT>";
+      echo "               $motd";
       echo "            </TD>";
       echo "         </TR>";
       echo "      </TABLE>";
@@ -55,13 +55,13 @@
       echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
       echo "   <TR>";
       echo "      <TD BGCOLOR=\"$color[0]\">";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><B><CENTER>". _("Messages Deleted") ."</CENTER></B></FONT>";
+      echo "         <B><CENTER>". _("Messages Deleted") ."</CENTER></B>";
       echo "   </TD></TR><TR><TD>";
-      echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>". _("The selected messages were deleted successfully.") ."<BR>\n";
+      echo "      <CENTER><BR>". _("The selected messages were deleted successfully.") ."<BR>\n";
       echo "      <BR>";
       echo "              <A HREF=\"webmail.php?right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
       echo "              ". _("Click here to return to ") ."$mailbox</A>.";
-      echo "      </FONT></CENTER>";
+      echo "      </CENTER>";
       echo "   </TD></TR>";
       echo "</TABLE>";
     }
@@ -72,13 +72,13 @@
       echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
       echo "   <TR>";
       echo "      <TD BGCOLOR=\"$color[0]\">";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><B><CENTER>". _("Messages Moved") ."</CENTER></B></FONT>";
+      echo "         <B><CENTER>". _("Messages Moved") ."</CENTER></B>";
       echo "   </TD></TR><TR><TD>";
-      echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>". _("The selected messages were moved successfully.") ."<BR>\n";
+      echo "      <CENTER><BR>". _("The selected messages were moved successfully.") ."<BR>\n";
       echo "      <BR>";
       echo "              <A HREF=\"webmail.php?right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
       echo "              ". _("Click here to return to ") ."$mailbox</A>.";
-      echo "      </FONT></CENTER>";
+      echo "      </CENTER>";
       echo "   </TD></TR>";
       echo "</TABLE>";
     }
@@ -89,13 +89,13 @@
       echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
       echo "   <TR>";
       echo "      <TD BGCOLOR=\"$color[0]\">";
-      echo "         <FONT FACE=\"Arial,Helvetica\" COLOR=\"$color[2]\"><B><CENTER>". _("ERROR") ."</CENTER></B></FONT>";
+      echo "         <FONT COLOR=\"$color[2]\"><B><CENTER>". _("ERROR") ."</CENTER></B></FONT>";
       echo "   </TD></TR><TR><TD>";
-      echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>$message<BR>\n";
+      echo "      <CENTER><BR>$message<BR>\n";
       echo "      <BR>";
       echo "              <A HREF=\"webmail.php?right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
       echo "              ". _("Click here to return to ") ."$mailbox</A>.";
-      echo "      </FONT></CENTER>";
+      echo "      </CENTER>";
       echo "   </TD></TR>";
       echo "</TABLE>";
     }
@@ -105,10 +105,10 @@
       echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
       echo "   <TR>";
       echo "      <TD BGCOLOR=\"$color[0]\">";
-      echo "         <FONT FACE=\"Arial,Helvetica\" COLOR=\"$color[2]\"><B><CENTER>" . _("ERROR") . "</CENTER></B></FONT>";
+      echo "         <FONT COLOR=\"$color[2]\"><B><CENTER>" . _("ERROR") . "</CENTER></B></FONT>";
       echo "   </TD></TR><TR><TD>";
-      echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>$message";
-      echo "      </FONT></CENTER>";
+      echo "      <CENTER><BR>$message";
+      echo "      </CENTER>";
       echo "   </TD></TR>";
       echo "</TABLE>";
     }
diff --git a/functions/imap_general.php b/functions/imap_general.php
index 44da9665..c18cfa74 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -37,14 +37,14 @@
 
       if ($handle_errors == true) {
          if ($response == "NO") {
-            echo "<br><b><font face=\"arial,helvetica\" color=$color[2]>";
+            echo "<br><b><font color=$color[2]>";
             echo _("ERROR : Could not complete request.");
             echo "</b><br>";
             echo _("Reason Given: ");
             echo "$message</font><br>";
             exit;
          } else if ($response == "BAD") {
-            echo "<br><b><font face=\"arial,helvetica\" color=$color[2]>";
+            echo "<br><b><font color=$color[2]>";
             echo _("ERROR : Bad or malformed request.");
             echo "</b><br>";
             echo _("Server responded: ");
@@ -94,7 +94,7 @@
                         <table width=70% noborder bgcolor=<? echo $color[4] ?> align=center>
                            <tr>
                               <td bgcolor=<? echo $color[0] ?>>
-                                 <font face="arial,helvetica" color=<? echo $color[2] ?>>
+                                 <font color=<? echo $color[2] ?>>
                                  <center>
                                  <? echo _("ERROR") ?>
                                  </center>
@@ -103,7 +103,7 @@
                            </tr>
                            <tr>
                               <td>
-                                 <font face="arial,helvetica" color=<? echo $color[2] ?>>
+                                 <font color=<? echo $color[2] ?>>
                                  <center>
                                  <? echo _("Unknown user or password incorrect.") ?><br>
                                  <a href="login.php"><? echo _("Click here to try again") ?></a>
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 7ec2a6f7..2130cd2e 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -18,15 +18,15 @@
       $subject = trim(stripslashes($subject));
       echo "<TR>\n";
       if ($seen == false) {
-         echo "   <TD><FONT FACE=\"Arial,Helvetica\"><nobr><B><input type=checkbox name=\"msg[$t]\" value=$i></B></nobr></FONT></TD>\n";
-         echo "   <TD><FONT FACE=\"Arial,Helvetica\"><B>$senderName</B></FONT></TD>\n";
-         echo "   <TD><CENTER><B><FONT FACE=\"Arial,Helvetica\">$dateString</FONT></B></CENTER></TD>\n";
-         echo "   <TD><FONT FACE=\"Arial,Helvetica\"><B><A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$i&sort=$sort&startMessage=$startMessage&show_more=0\">$subject</A></B></FONT></TD>\n";
+         echo "   <TD><nobr><B><input type=checkbox name=\"msg[$t]\" value=$i></B></nobr></TD>\n";
+         echo "   <TD><B>$senderName</B></TD>\n";
+         echo "   <TD><CENTER><B>$dateString</B></CENTER></TD>\n";
+         echo "   <TD><B><A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$i&sort=$sort&startMessage=$startMessage&show_more=0\">$subject</A></B></TD>\n";
       } else {
-         echo "   <TD><FONT FACE=\"Arial,Helvetica\"><nobr><input type=checkbox name=\"msg[$t]\" value=$i></nobr></FONT></TD>\n";
-         echo "   <TD><FONT FACE=\"Arial,Helvetica\">$senderName</FONT></TD>\n";
-         echo "   <TD><FONT FACE=\"Arial,Helvetica\"><CENTER>$dateString</CENTER></FONT></TD>\n";
-         echo "   <TD><FONT FACE=\"Arial,Helvetica\"><A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$i&sort=$sort&startMessage=$startMessage&show_more=0\">$subject</A></FONT></TD>\n";
+         echo "   <TD><nobr><input type=checkbox name=\"msg[$t]\" value=$i></nobr></TD>\n";
+         echo "   <TD>$senderName</TD>\n";
+         echo "   <TD><CENTER>$dateString</CENTER></TD>\n";
+         echo "   <TD><A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$i&sort=$sort&startMessage=$startMessage&show_more=0\">$subject</A></TD>\n";
       }
       echo "</TR>\n";
    }
@@ -167,26 +167,26 @@
 
       if ($startMessage < $endMessage) {
          echo "<TR BGCOLOR=\"$color[4]\"><TD>";
-         echo "<CENTER><FONT FACE=\"Arial,Helvetica\">". _("Viewing messages ") ."<B>$startMessage</B>". _(" to ") ."<B>$endMessage</B> ($numMessages total)</FONT></CENTER>\n";
+         echo "<CENTER>". _("Viewing messages ") ."<B>$startMessage</B>". _(" to ") ."<B>$endMessage</B> ($numMessages total)</CENTER>\n";
          echo "</TD></TR>\n";
       } else if ($startMessage == $endMessage) {
          echo "<TR BGCOLOR=\"$color[4]>\"TD>";
-         echo "<CENTER><FONT FACE=\"Arial,Helvetica\">". _("Viewing message ") ."<B>$startMessage</B> ($numMessages ". _("total") .")</FONT></CENTER>\n";
+         echo "<CENTER>". _("Viewing message ") ."<B>$startMessage</B> ($numMessages ". _("total") .")</CENTER>\n";
          echo "</TD></TR>\n";
       }
 
       echo "<TR BGCOLOR=\"$color[4]\"><TD>";
       if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) {
-         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">". _("Previous") ."</FONT></A>\n";
-         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">". _("Next") ."</FONT></A>\n";
+         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Previous") ."</A>\n";
+         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Next") ."</A>\n";
       }
       else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) {
-         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">". _("Previous") ."</FONT></A>\n";
-         echo "<FONT FACE=\"Arial,Helvetica\" COLOR=\"$color[9]\">Next</FONT>\n";
+         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Previous") ."</A>\n";
+         echo "<FONT COLOR=\"$color[9]\">Next</FONT>\n";
       }
       else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) {
-         echo "<FONT FACE=\"Arial,Helvetica\" COLOR=\"$color[9]\">Previous</FONT>\n";
-         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">". _("Next") ."</FONT></A>\n";
+         echo "<FONT COLOR=\"$color[9]\">Previous</FONT>\n";
+         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Next") ."</A>\n";
       }
       echo "</TD></TR>\n";
 
@@ -197,7 +197,7 @@
       echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=60% ALIGN=LEFT>\n";
-      echo "         <NOBR><FONT FACE=\"Arial,Helvetica\"><SMALL>". _("Move selected to:") ."</SMALL></FONT>";
+      echo "         <NOBR><SMALL>". _("Move selected to:") ."</SMALL>";
       echo "         <TT><SMALL><SELECT NAME=\"targetMailbox\">";
 
       $boxes = sqimap_mailbox_list($imapConnection, $boxes);
@@ -219,11 +219,11 @@
          }
       }
       echo "         </SELECT></SMALL></TT>";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><SMALL><INPUT TYPE=SUBMIT NAME=\"moveButton\" VALUE=\"". _("Move") ."\"></SMALL></FONT></NOBR>\n";
+      echo "         <SMALL><INPUT TYPE=SUBMIT NAME=\"moveButton\" VALUE=\"". _("Move") ."\"></SMALL></NOBR>\n";
 
       echo "      </TD>\n";
       echo "      <TD WIDTH=40% ALIGN=RIGHT>\n";
-      echo "         <NOBR><FONT FACE=\"Arial,Helvetica\"><SMALL><INPUT TYPE=SUBMIT VALUE=\"". _("Delete") ."\">&nbsp;". _("checked messages") ."</SMALL></FONT></NOBR>\n";
+      echo "         <NOBR><SMALL><INPUT TYPE=SUBMIT VALUE=\"". _("Delete") ."\">&nbsp;". _("checked messages") ."</SMALL></NOBR>\n";
       echo "      </TD>";
       echo "   </TR>\n";
 
@@ -233,9 +233,9 @@
       echo "<TR><TD BGCOLOR=\"$color[0]\">";
       echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=1 BGCOLOR=\"$color[4]\">";
       echo "<TR BGCOLOR=\"$color[5]\" ALIGN=\"center\">";
-      echo "   <TD WIDTH=5%><FONT FACE=\"Arial,Helvetica\"><B>&nbsp;</B></FONT></TD>";
+      echo "   <TD WIDTH=5%><B>&nbsp;</B></TD>";
       /** FROM HEADER **/
-      echo "   <TD WIDTH=25%><FONT FACE=\"Arial,Helvetica\"><B>". _("From") ."</B></FONT>";
+      echo "   <TD WIDTH=25%><B>". _("From") ."</B>";
       if ($sort == 2)
          echo "   <A HREF=\"right_main.php?sort=3&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
       else if ($sort == 3)
@@ -243,7 +243,7 @@
       else
          echo "   <A HREF=\"right_main.php?sort=3&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
       /** DATE HEADER **/
-      echo "   <TD WIDTH=15%><FONT FACE=\"Arial,Helvetica\"><B>". _("Date") ."</B></FONT>";
+      echo "   <TD WIDTH=15%><B>". _("Date") ."</B>";
       if ($sort == 0)
          echo "   <A HREF=\"right_main.php?sort=1&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
       else if ($sort == 1)
@@ -251,7 +251,7 @@
       else
          echo "   <A HREF=\"right_main.php?sort=0&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
       /** SUBJECT HEADER **/
-      echo "   <TD WIDTH=%><FONT FACE=\"Arial,Helvetica\"><B>". _("Subject") ."</B></FONT>\n";
+      echo "   <TD WIDTH=%><B>". _("Subject") ."</B>\n";
       if ($sort == 4)
         echo "   <A HREF=\"right_main.php?sort=5&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
       else if ($sort == 5)
@@ -281,16 +281,16 @@
 
       echo "<TR BGCOLOR=\"$color[4]\"><TD>";
       if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) {
-         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">" . _("Previous") . "</FONT></A>\n";
-         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">" . _("Next") . "</FONT></A>\n";
+         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Previous") . "</A>\n";
+         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Next") . "</A>\n";
       }
       else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) {
-         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">" . _("Previous") . "</FONT></A>\n";
-         echo "<FONT FACE=\"Arial,Helvetica\" COLOR=\"$color[9]\">" . _("Next") . "</FONT>\n";
+         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Previous") . "</A>\n";
+         echo "<FONT COLOR=\"$color[9]\">" . _("Next") . "</FONT>\n";
       }
       else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) {
-         echo "<FONT FACE=\"Arial,Helvetica\" COLOR=\"$color[9]\">Previous</FONT>\n";
-         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">" . _("Next") . "</FONT></A>\n";
+         echo "<FONT COLOR=\"$color[9]\">Previous</FONT>\n";
+         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Next") . "</A>\n";
       }
       echo "</TD></TR></TABLE>"; /** End of message-list table */
    }
diff --git a/functions/page_header.php b/functions/page_header.php
index 3ffe0c31..87db53b5 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -35,19 +35,19 @@
       echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 COLS=2 WIDTH=100% CELLSPACING=0 CELLPADDING=2>";
       echo "   <TR BGCOLOR=\"$color[9]\" WIDTH=100%>";
       echo "      <TD ALIGN=left WIDTH=30%>";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"signout.php\" TARGET=_top><B>" . _("Sign Out") . "</B></A></FONT>";
+      echo "         <A HREF=\"signout.php\" TARGET=_top><B>" . _("Sign Out") . "</B></A>";
       echo "      </TD><TD ALIGN=right WIDTH=70%>";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><div align=right>" . _("Current Folder: ") . "<B>$shortBoxName&nbsp;</div></B></FONT>";
+      echo "         <div align=right>" . _("Current Folder: ") . "<B>$shortBoxName&nbsp;</div></B>";
       echo "      </TD>";
       echo "   </TR></TABLE>\n";
       echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 COLS=2 WIDTH=100% CELLSPACING=0 CELLPADDING=2><TR>";
       echo "      <TD ALIGN=left WIDTH=70%>";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"compose.php\">" . _("Compose") . "</A></FONT>&nbsp&nbsp";
-      echo "         <FONT FACE=\"Arial,Helvetica\">". _("Addresses") ."</FONT>&nbsp&nbsp";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"folders.php\">" . _("Folders") . "</A></FONT>&nbsp&nbsp";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"options.php\">" . _("Options") . "</A></FONT>&nbsp&nbsp";
+      echo "         <A HREF=\"compose.php\">" . _("Compose") . "</A>&nbsp&nbsp";
+      echo "         ". _("Addresses") ."&nbsp&nbsp";
+      echo "         <A HREF=\"folders.php\">" . _("Folders") . "</A>&nbsp&nbsp";
+      echo "         <A HREF=\"options.php\">" . _("Options") . "</A>&nbsp&nbsp";
       echo "      </TD><TD ALIGN=right WIDTH=30%>";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"http://squirrelmail.sourceforge.net\" TARGET=_top>SquirrelMail</A></FONT>";
+      echo "         <A HREF=\"http://squirrelmail.sourceforge.net\" TARGET=_top>SquirrelMail</A>";
       echo "      </TD>";
       echo "</TABLE>";
   }
diff --git a/src/compose.php b/src/compose.php
index ba3f2a51..83c7bb54 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -155,9 +155,7 @@
       echo "<TABLE COLS=2 WIDTH=50 ALIGN=center CELLSPACING=0 BORDER=0>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
-      echo "         <FONT FACE=\"Arial,Helvetica\">";
       echo _("To:");
-      echo " </FONT>\n";
       echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($send_to)
          echo "         <INPUT TYPE=TEXT NAME=send_to VALUE=\"$send_to\" SIZE=60><BR>";
@@ -167,7 +165,7 @@
       echo "   </TR>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
-      echo "         <FONT FACE=\"Arial,Helvetica\">"._("CC").":</FONT>\n";
+      echo _("CC:");
       echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($send_to_cc)
          echo "         <INPUT TYPE=TEXT NAME=send_to_cc SIZE=60 VALUE=\"$send_to_cc\"><BR>";
@@ -177,7 +175,7 @@
       echo "   </TR>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
-      echo "         <FONT FACE=\"Arial,Helvetica\">BCC:</FONT>\n";
+      echo _("BCC:");
       echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($send_to_bcc)
          echo "         <INPUT TYPE=TEXT NAME=send_to_bcc VALUE=\"$send_to_bcc\" SIZE=60><BR>";
@@ -187,9 +185,7 @@
       echo "   </TR>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
-      echo "         <FONT FACE=\"Arial,Helvetica\">";
       echo _("Subject:");
-      echo " </FONT>\n";
       echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($reply_subj) {
          $reply_subj = str_replace("\"", "'", $reply_subj);
@@ -229,8 +225,7 @@
       // This code is for attachments
       echo "   <tr>\n";
       echo "     <TD WIDTH=50 BGCOLOR=\"$color[0]\" VALIGN=TOP ALIGN=RIGHT>\n";
-      echo "      <FONT FACE=\"Arial,Helvetica\">";
-      echo "      <SMALL><BR></SMALL>"._("Attach:")."</FONT>\n";
+      echo "      <SMALL><BR></SMALL>"._("Attach:");
       echo "      </td><td width=% ALIGN=left BGCOLOR=\"$color[0]\">\n";
       //      echo "      <INPUT TYPE=\"hidden\" name=\"MAX_FILE_SIZE\"\n";
       //      echo "      value=\"10000\">\n";
@@ -259,10 +254,9 @@
    }
 
    function showSentForm () {
-      echo "<FONT FACE=\"Arial,Helvetica\">";
       echo "<BR><BR><BR><CENTER><B>Message Sent!</B><BR><BR>";
       echo "You will be automatically forwarded.<BR>If not, <A HREF=\"right_main.php\">click here</A>";
-      echo "</CENTER></FONT>";
+      echo "</CENTER>";
    }
 
    function checkInput () {
diff --git a/src/download.php b/src/download.php
index f8a334d1..a4a81a1e 100644
--- a/src/download.php
+++ b/src/download.php
@@ -24,9 +24,9 @@
       echo "</CENTER></B>";
       echo "</TD></TR><TR><TD BGCOLOR=\"$color[4]\">";
       $urlmailbox = urlencode($mailbox);
-      echo "<FONT FACE=\"Arial, Helvetica\"><CENTER><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$entid&mailbox=$urlmailbox\">";
+      echo "<CENTER><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$entid&mailbox=$urlmailbox\">";
       echo _("Download this as a file");
-      echo "</A></CENTER><BR><BR></FONT><TT>";
+      echo "</A></CENTER><BR><BR><TT>";
       if ($type1 == "html")
          echo $body;
       else
diff --git a/src/folders.php b/src/folders.php
index 87f32799..1887b9db 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -18,9 +18,7 @@
 
    echo "<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>\n";
    echo "   <TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>\n";
-   echo "      <FONT FACE=\"Arial,Helvetica\">";
    echo _("Folders");
-   echo "</FONT>\n";
    echo "   </TD></TR>\n";
    echo "</TABLE>\n";
 
@@ -29,9 +27,9 @@
 
    /** DELETING FOLDERS **/
    echo "<TABLE WIDTH=70% COLS=1 ALIGN=CENTER>\n";
-   echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><FONT FACE=\"Arial,Helvetica\"><B>";
+   echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><B>";
    echo _("Delete Folder");
-   echo "</B></FONT></TD></TR>";
+   echo "</B></TD></TR>";
    echo "<TR><TD BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
    echo "<FORM ACTION=folders_delete.php METHOD=SUBMIT>\n";
    echo "<TT><SELECT NAME=mailbox>\n";
@@ -52,22 +50,21 @@
    }
 
    echo "</SELECT></TT>\n";
-   echo "<FONT FACE=\"Arial,Helvetica\"><INPUT TYPE=SUBMIT VALUE=\"";
+   echo "<INPUT TYPE=SUBMIT VALUE=\"";
    echo _("Delete");
-   echo "\"></FONT>\n";
+   echo "\">\n";
    echo "</FORM><BR></TD></TR><BR>\n";
 
    /** CREATING FOLDERS **/
-   echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><FONT FACE=\"Arial,Helvetica\"><B>";
+   echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><B>";
    echo _("Create Folder");
-   echo "</B></FONT></TD></TR>";
+   echo "</B></TD></TR>";
    echo "<TR><TD BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
    echo "<FORM ACTION=folders_create.php METHOD=POST>\n";
    echo "<INPUT TYPE=TEXT SIZE=25 NAME=folder_name><BR>\n";
-   echo "<FONT FACE=\"Arial,Helvetica\">";
    echo _("as a subfolder of");
-   echo "</FONT><BR>";
-   echo "<TT><SELECT NAME=subfolder><FONT FACE=\"Arial,Helvetica\">\n";
+   echo "<BR>";
+   echo "<TT><SELECT NAME=subfolder>\n";
    if ($default_sub_of_inbox == false)
       echo "<OPTION SELECTED>[ None ]\n";
    else
@@ -89,22 +86,21 @@
 //      }
    }
    echo "</SELECT></TT><BR>\n";
-   echo "<FONT FACE=\"Arial,Helvetica\">";
    if ($show_contain_subfolders_option) {
-      echo "<INPUT TYPE=CHECKBOX NAME=\"contain_subs\"><FONT FACE=\"Arial,Helvetica\"> &nbsp;";
+      echo "<INPUT TYPE=CHECKBOX NAME=\"contain_subs\"> &nbsp;";
       echo _("Let this folder contain subfolders");
-      echo "</FONT><BR>";
+      echo "<BR>";
    }   
-   echo "<INPUT TYPE=SUBMIT VALUE=Create></FONT>\n";
+   echo "<INPUT TYPE=SUBMIT VALUE=Create>\n";
    echo "</FORM><BR></TD></TR><BR>\n";
 
    /** RENAMING FOLDERS **/
-   echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><FONT FACE=\"Arial,Helvetica\"><B>";
+   echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><B>";
    echo _("Rename a Folder");
-   echo "</B></FONT></TD></TR>";
+   echo "</B></TD></TR>";
    echo "<TR><TD BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
    echo "<FORM ACTION=folders_rename_getname.php METHOD=POST>\n";
-   echo "<TT><SELECT NAME=old><FONT FACE=\"Arial,Helvetica\">\n";
+   echo "<TT><SELECT NAME=old>\n";
    for ($i = 0; $i < count($boxes); $i++) {
       $use_folder = true;
       for ($p = 0; $p < count($special_folders); $p++) {
@@ -121,9 +117,9 @@
       }
    }
    echo "</SELECT></TT>\n";
-   echo "<FONT FACE=\"Arial,Helvetica\"><INPUT TYPE=SUBMIT VALUE=\"";
+   echo "<INPUT TYPE=SUBMIT VALUE=\"";
    echo _("Rename");
-   echo "\"></FONT>\n";
+   echo "\">\n";
    echo "</FORM></TD></TR></TABLE><BR>\n";
 
 ?>
diff --git a/src/folders_create.php b/src/folders_create.php
index 4e42dd14..480f052f 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -37,7 +37,6 @@
 //   } else {
       echo "<html><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
       displayPageHeader($color, "None");
-      echo "<FONT FACE=\"Arial,Helvetica\">";
       echo "<BR><BR><BR><CENTER><B>";
       echo _("Folder Created!");
       echo "</B><BR><BR>";
@@ -46,7 +45,7 @@
       echo _("Click here");
       echo "</A> ";
       echo _("to continue.");
-      echo "</CENTER></FONT>";
+      echo "</CENTER>";
       echo "</BODY></HTML>";
 //   }
 ?>
diff --git a/src/folders_delete.php b/src/folders_delete.php
index a1c67ca0..ec1f61a1 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -74,7 +74,6 @@
    /** Log out this session **/
    sqimap_logout($imap_stream);
 
-   echo "<FONT FACE=\"Arial,Helvetica\">";
    echo "<BR><BR><BR><CENTER><B>";
    echo _("Folder Deleted!");
    echo "</B><BR><BR>";
@@ -83,7 +82,7 @@
    echo _("Click here");
    echo "</A> ";
    echo _("to continue.");
-   echo "</CENTER></FONT>"; 
+   echo "</CENTER>"; 
    
    echo "</BODY></HTML>";
 ?>
diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php
index 0aa812ba..ecf4368f 100644
--- a/src/folders_rename_getname.php
+++ b/src/folders_rename_getname.php
@@ -25,9 +25,9 @@
    echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
    displayPageHeader($color, "None");
    echo "<TABLE WIDTH=100% COLS=1>";
-   echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><FONT FACE=\"Arial,Helvetica\"><B>";
+   echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><B>";
    echo _("Rename a folder");
-   echo "</B></FONT></TD></TR>";
+   echo "</B></TD></TR>";
    echo "<TR><TD BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
    echo "<FORM ACTION=folders_rename_do.php METHOD=POST>\n";
    echo _("New name:");
diff --git a/src/left_main.php b/src/left_main.php
index 1a381630..07782970 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -41,11 +41,11 @@
       }
 
       if ($special_color == true) {
-         $line .= "<a href=\"right_main.php?sort=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\"><FONT FACE=\"Arial,Helvetica\"  COLOR=\"$color[11]\">";
+         $line .= "<a href=\"right_main.php?sort=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\"><FONT COLOR=\"$color[11]\">";
          $line .= replace_spaces($mailbox);
          $line .= "</font></a>";
       } else {
-         $line .= "<a href=\"right_main.php?sort=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\"><FONT FACE=\"Arial,Helvetica\">";
+         $line .= "<a href=\"right_main.php?sort=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
          $line .= replace_spaces($mailbox);
          $line .= "</font></a>";
       }
@@ -54,14 +54,14 @@
          $line .= "</B>";
 
       if ($numUnseen > 0) {
-         $line .= "&nbsp;<FONT FACE=\"Arial,Helvetica\" SIZE=2>($numUnseen)</FONT>";
+         $line .= "&nbsp;<small>($numUnseen)</small>";
       }
 
       if (($move_to_trash == true) && (trim($real_box) == $trash_folder)) {
          $urlMailbox = urlencode($real_box);
-         $line .= "<FONT FACE=\"Arial,Helvetica\" SIZE=2>";
+         $line .= "<small>";
          $line .= "&nbsp;&nbsp;&nbsp;&nbsp;(<B><A HREF=\"empty_trash.php?numMessages=$numMessages&mailbox=$urlMailbox\" TARGET=right style=\"text-decoration:none\">"._("purge")."</A></B>)";
-         $line .= "</FONT></a>\n";
+         $line .= "</small></a>\n";
       }
 
       echo "</NOBR>";
@@ -80,17 +80,15 @@
    }
    
    echo "<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" LINK=\"$color[6]\" VLINK=\"$color[6]\" ALINK=\"$color[6]\">";
-   echo "<FONT FACE=\"Arial,Helvetica\">";
 
    $boxes = sqimap_mailbox_list($imapConnection);
 
-   echo "<FONT FACE=\"Arial,Helvetica\" SIZE=4><B><CENTER>";
+   echo "<FONT SIZE=4><B><CENTER>";
    echo _("Folders") . "</B><BR></FONT>";
 
-   echo "<FONT FACE=\"Arial,Helvetica\" SIZE=2>(<A HREF=\"../src/left_main.php\" TARGET=\"left\">";
+   echo "<small>(<A HREF=\"../src/left_main.php\" TARGET=\"left\">";
    echo _("refresh folder list");
-   echo "</A>)</FONT></CENTER><BR>";
-   echo "<FONT FACE=\"Arial,Helvetica\">\n";
+   echo "</A>)</small></CENTER><BR>";
    $delimeter = sqimap_get_delimiter($imapConnection);
 
    for ($i = 0;$i < count($boxes); $i++) {
@@ -104,9 +102,9 @@
                $noselect = true;
          }
          if ($noselect == true) {
-            $line .= "<FONT COLOR=\"$color[10]\" FACE=\"Arial,Helvetica\">";
+            $line .= "<FONT COLOR=\"$color[10]\">";
             $line .= replace_spaces(readShortMailboxName($mailbox, $delimeter));
-            $line .= "</FONT><FONT FACE=\"Arial,Helvetica\">";
+            $line .= "</FONT>";
          } else {
             $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $color, $move_to_trash);
          }
@@ -116,9 +114,8 @@
       echo "$line<BR>";
    }
 
-   echo "</FONT>";
 
    fclose($imapConnection);
                                   
 ?>
-</FONT></BODY></HTML>
+</BODY></HTML>
diff --git a/src/login.php b/src/login.php
index 633a8688..595f74b8 100644
--- a/src/login.php
+++ b/src/login.php
@@ -39,30 +39,26 @@
    
    echo "<FORM ACTION=webmail.php METHOD=\"POST\" NAME=f>\n";
    echo "<CENTER><IMG SRC=\"$org_logo\"</CENTER>\n";
-   echo "<CENTER><FONT FACE=\"Arial,Helvetica\" SIZE=-2>";
+   echo "<CENTER><SMALL>";
    echo _("SquirrelMail version $version<BR>By the SquirrelMail Development Team");
-   echo "<BR></FONT><CENTER>\n";
+   echo "<BR></SMALL><CENTER>\n";
    echo "<TABLE COLS=1 WIDTH=350>\n";
    echo "   <TR>\n";
    echo "      <TD BGCOLOR=DCDCDC>\n";
-   echo "         <B><CENTER><FONT FACE=\"Arial,Helvetica\">$org_name Login</FONT></CENTER></B>\n";
+   echo "         <B><CENTER>$org_name Login</CENTER></B>\n";
    echo "      </TD>\n";
    echo "   </TR><TR>\n";
    echo "      <TD BGCOLOR=FFFFFF>\n";
    echo "         <TABLE COLS=2 WIDTH=100%>\n";
    echo "            <TR>\n";
    echo "               <TD WIDTH=30% ALIGN=right>\n";
-   echo "                  <FONT FACE=\"Arial,Helvetica\">";
    echo _("Name:");
-   echo "		   </FONT>\n";
    echo "               </TD><TD WIDTH=* ALIGN=left>\n";
    echo "                  <CENTER><INPUT TYPE=TEXT NAME=username></CENTER>\n";
    echo "               </TD>\n";
    echo "            </TR><TR>\n";
    echo "               <TD WIDTH=30% ALIGN=right>\n";
-   echo "                  <FONT FACE=\"Arial,Helvetica\">";
    echo _("Password:");
-   echo "		   </FONT>\n";
    echo "               </TD><TD WIDTH=* ALIGN=left>\n";
    echo "                  <CENTER><INPUT TYPE=PASSWORD NAME=key></CENTER>\n";
    echo "               </TD>\n"; 
diff --git a/src/options.php b/src/options.php
index 914e1e62..834d108e 100644
--- a/src/options.php
+++ b/src/options.php
@@ -32,9 +32,7 @@
 
    echo "<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>\n";
    echo "   <TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>\n";
-   echo "      <FONT FACE=\"Arial,Helvetica\">";
    echo _("Options");
-   echo "</FONT>\n";
    echo "   </TD></TR>\n";
    echo "</TABLE>\n";
 
@@ -43,48 +41,34 @@
    // FULL NAME
    echo "   <TR>";
    echo "      <TD WIDTH=20% ALIGN=RIGHT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
    echo           _("Full Name:");
-   echo "         </FONT>";
    echo "      </TD>";
    echo "      <TD WIDTH=80% ALIGN=LEFT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
    echo "         <INPUT TYPE=TEXT NAME=full_name VALUE=\"$fullname\" SIZE=50><BR>";
-   echo "         </FONT>";
    echo "      </TD>";
    echo "   </TR>";
    // FROM-ADDRESS
    echo "   <TR>";
    echo "      <TD WIDTH=20% ALIGN=RIGHT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
    echo           _("E-mail address:");
-   echo "         </FONT>";
    echo "      </TD>";
    echo "      <TD WIDTH=80% ALIGN=LEFT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
    echo "         <INPUT TYPE=TEXT NAME=email_address VALUE=\"$email_address\" SIZE=50><BR>";
-   echo "         </FONT>";
    echo "      </TD>";
    echo "   </TR>";
    // REPLY-TO
    echo "   <TR>";
    echo "      <TD WIDTH=20% ALIGN=RIGHT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
    echo           _("Reply-to:");
-   echo "         </FONT>";
    echo "      </TD>";
    echo "      <TD WIDTH=80% ALIGN=LEFT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
    echo "         <INPUT TYPE=TEXT NAME=reply_to VALUE=\"$replyto\" SIZE=50><BR>";
-   echo "         </FONT>";
    echo "      </TD>";
    echo "   </TR>";
    // THEME
    echo "   <TR>";
    echo "      <TD WIDTH=20% ALIGN=RIGHT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
    echo           _("Theme:");
-   echo "         </FONT>";
    echo "      </TD>";
    echo "      <TD WIDTH=80% ALIGN=LEFT>";
 
@@ -101,9 +85,7 @@
    // LANGUAGE
    echo "   <TR>";
    echo "      <TD WIDTH=20% ALIGN=RIGHT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
    echo           _("Language:");
-   echo "         </FONT>";
    echo "      </TD>";
    echo "      <TD WIDTH=80% ALIGN=LEFT>";
 
@@ -125,13 +107,10 @@
    // MOVE_TO_TRASH
    echo "   <TR>";
    echo "      <TD WIDTH=60% ALIGN=RIGHT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
    echo           _("Move deleted messages to ");
    echo "\"$trash_folder\"?";
-   echo "         </FONT>";
    echo "      </TD>";
    echo "      <TD WIDTH=40% ALIGN=LEFT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
    if ($move_to_trash == true)
       echo "         <INPUT TYPE=RADIO NAME=movetotrash VALUE=1 CHECKED>&nbsp;True<BR>";
    else
@@ -142,53 +121,41 @@
    else
       echo "         <INPUT TYPE=RADIO NAME=movetotrash VALUE=0>&nbsp;False";
 
-   echo "         </FONT>";
    echo "      </TD>";
    echo "   </TR>";
 
    // WRAP_AT
    echo "   <TR>";
    echo "      <TD WIDTH=60% ALIGN=RIGHT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
    echo           _("Wrap incoming text at:");
-   echo "         </FONT>";
    echo "      </TD>";
    echo "      <TD WIDTH=40% ALIGN=LEFT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
    if (isset($wrap_at))
       echo "         <TT><INPUT TYPE=TEXT SIZE=5 NAME=wrapat VALUE=\"$wrap_at\"></TT><BR>";
    else
       echo "         <TT><INPUT TYPE=TEXT SIZE=5 NAME=wrapat VALUE=\"86\"></TT><BR>";
-   echo "         </FONT>";
    echo "      </TD>";
    echo "   </TR>";
 
    // EDITOR_SIZE
    echo "   <TR>";
    echo "      <TD WIDTH=60% ALIGN=RIGHT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
    echo           _("Size of editor window (in characters):");
-   echo "         </FONT>";
    echo "      </TD>";
    echo "      <TD WIDTH=40% ALIGN=LEFT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
    if ($editor_size >= 5)
       echo "         <TT><INPUT TYPE=TEXT SIZE=5 NAME=editorsize VALUE=\"$editor_size\"></TT><BR>";
    else
       echo "         <TT><INPUT TYPE=TEXT SIZE=5 NAME=editorsize VALUE=\"76\"></TT><BR>";
-   echo "         </FONT>";
    echo "      </TD>";
    echo "   </TR>";
 
    // LEFT_REFRESH
    echo "   <TR>";
    echo "      <TD WIDTH=60% ALIGN=RIGHT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
    echo           _("Time between auto refresh of folder list:");
-   echo "         </FONT>";
    echo "      </TD>";
    echo "      <TD WIDTH=40% ALIGN=LEFT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
    echo "               <SELECT name=leftrefresh>";
    if (($left_refresh == "None") || ($left_refresh == "")) 
       echo "                  <OPTION VALUE=None SELECTED>None";
@@ -271,7 +238,6 @@
       echo "                  <OPTION VALUE=1800>30 Minutes";
    
       echo "               </SELECT>";
-      echo "         </FONT>";
       echo "      </TD>";
       echo "   </TR>";
       echo "</TABLE>";
diff --git a/src/options_submit.php b/src/options_submit.php
index af376da7..0fca6f72 100644
--- a/src/options_submit.php
+++ b/src/options_submit.php
@@ -33,7 +33,6 @@
    echo "<HTML>";
    echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
    displayPageHeader($color, "None");
-   echo "<FONT FACE=\"Arial,Helvetica\">";
    echo "<BR><BR><BR><CENTER><B>";
    echo _("Options Saved!");
    echo "</B><BR><BR>";
@@ -42,6 +41,6 @@
    echo _("Click here");
    echo "</A> ";
    echo _("to continue.");
-   echo "</CENTER></FONT>";
+   echo "</CENTER>";
    echo "</BODY></HTML>";
 ?>
diff --git a/src/read_body.php b/src/read_body.php
index bf3d1c9b..757a3d96 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -97,16 +97,16 @@
    echo "      <TABLE WIDTH=100% CELLSPACING=0 BORDER=0 COLS=2 CELLPADDING=3>";
    echo "         <TR>";
    echo "            <TD ALIGN=LEFT WIDTH=50%>";
-   echo "               <FONT FACE=\"Arial,Helvetica\" SIZE=2>";
+   echo "               <SMALL>";
    echo "               <A HREF=\"right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">";
    echo _("Message List");
    echo "</A>&nbsp;|&nbsp;";
    echo "               <A HREF=\"delete_message.php?mailbox=$urlMailbox&message=$passed_id&sort=$sort&startMessage=1\">";
    echo _("Delete");
    echo "</A>&nbsp;&nbsp;";
-   echo "               </FONT>";
+   echo "               </SMALL>";
    echo "            </TD><TD WIDTH=50% ALIGN=RIGHT>";
-   echo "               <FONT FACE=\"Arial,Helvetica\" SIZE=2>";
+   echo "               <SMALL>";
    echo "               <A HREF=\"compose.php?forward_id=$passed_id&forward_subj=$url_subj&mailbox=$urlMailbox\">";
    echo _("Forward");
    echo "</A>&nbsp;|&nbsp;";
@@ -116,7 +116,7 @@
    echo "               <A HREF=\"compose.php?send_to=$url_replytoall&send_to_cc=$url_replytoallcc&reply_subj=$url_subj&reply_id=$passed_id&mailbox=$urlMailbox\">";
    echo _("Reply All");
    echo "</A>&nbsp;&nbsp;";
-   echo "               </FONT>";
+   echo "               </SMALL>";
    echo "            </TD>";
    echo "         </TR>";
    echo "      </TABLE>";
@@ -126,50 +126,42 @@
    echo "      <TR>\n";
    /** subject **/
    echo "         <TD BGCOLOR=\"$color[4]\" WIDTH=15% ALIGN=RIGHT>\n";
-   echo "            <FONT FACE=\"Arial,Helvetica\">";
    echo _("Subject:");
-   echo "</FONT>\n";
    echo "         </TD><TD BGCOLOR=\"$color[4]\" WIDTH=85%>\n";
-   echo "            <FONT FACE=\"Arial,Helvetica\"><B>$subject</B></FONT>\n";
+   echo "            <B>$subject</B>\n";
    echo "         </TD>\n";
    echo "      </TR>\n";
    /** from **/
    echo "      <TR>\n";
    echo "         <TD BGCOLOR=\"$color[4]\" WIDTH=15% ALIGN=RIGHT>\n";
-   echo "            <FONT FACE=\"Arial,Helvetica\">";
    echo _("From:");
-   echo "</FONT>\n";
    echo "         </TD><TD BGCOLOR=\"$color[4]\" WIDTH=85%>\n";
-   echo "            <FONT FACE=\"Arial,Helvetica\"><B>$from_name</B></FONT>\n";
+   echo "            <B>$from_name</B>\n";
    echo "         </TD>\n";
    echo "      </TR>\n";
    /** date **/
    echo "      <TR>\n";
    echo "         <TD BGCOLOR=\"$color[4]\" WIDTH=15% ALIGN=RIGHT>\n";
-   echo "            <FONT FACE=\"Arial,Helvetica\">";
    echo _("Date:");
-   echo "</FONT>\n";
    echo "         </TD><TD BGCOLOR=\"$color[4]\" WIDTH=85%>\n";
-   echo "            <FONT FACE=\"Arial,Helvetica\"><B>$dateString</B></FONT>\n";
+   echo "            <B>$dateString</B>\n";
    echo "         </TD>\n";
    echo "      </TR>\n";
    /** to **/
    echo "      <TR>\n";
    echo "         <TD BGCOLOR=\"$color[4]\" WIDTH=15% ALIGN=RIGHT VALIGN=TOP>\n";
-   echo "            <FONT FACE=\"Arial,Helvetica\">";
    echo _("To:");
-   echo "</FONT>\n";
    echo "         </TD><TD BGCOLOR=\"$color[4]\" WIDTH=85% VALIGN=TOP>\n";
-   echo "            <FONT FACE=\"Arial,Helvetica\"><B>$to_string</B></FONT>\n";
+   echo "            <B>$to_string</B>\n";
    echo "         </TD>\n";
    echo "      </TR>\n";
    /** cc **/
    if ($message["HEADER"]["CC"][0]) {
       echo "      <TR>\n";
       echo "         <TD BGCOLOR=\"$color[4]\" WIDTH=15% ALIGN=RIGHT VALIGN=TOP>\n";
-      echo "            <FONT FACE=\"Arial,Helvetica\">Cc:</FONT>\n";
+      echo "            Cc:\n";
       echo "         </TD><TD BGCOLOR=\"$color[4]\" WIDTH=85% VALIGN=TOP>\n";
-      echo "            <FONT FACE=\"Arial,Helvetica\"><B>$cc_string</B></FONT>\n";
+      echo "            <B>$cc_string</B>\n";
       echo "         </TD>\n";
       echo "      </TR>\n";
    }
diff --git a/src/signout.php b/src/signout.php
index ae78e121..84ec5b5e 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -30,26 +30,25 @@
    echo "<BR><BR><TABLE BGCOLOR=FFFFFF BORDER=0 COLS=1 WIDTH=50% CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>";
    echo "   <TR BGCOLOR=DCDCDC WIDTH=100%>";
    echo "      <TD ALIGN=CENTER>";
-   echo "         <FONT FACE=\"Arial,Helvetica\"><B>";
+   echo "         <B>";
    echo _("Sign Out");
-   echo "</B></FONT>";
+   echo "</B>";
    echo "      </TD>";
    echo "   </TR>";
    echo "   <TR BGCOLOR=FFFFFF WIDTH=100%>";
    echo "      <TD ALIGN=CENTER>";
-   echo "         <FONT FACE=\"Arial,Helvetica\"><BR>";
+   echo "         <BR>";
    echo _("You have been successfully signed out.");
-   echo "<BR></FONT>";
-   echo "         <FONT FACE=\"Arial,Helvetica\">";
+   echo "<BR>";
    echo _("Click here to ");
    echo "<A HREF=\"login.php\" TARGET=_top>";
    echo _("log back in.");
-   echo "</A></FONT><BR><BR>";
+   echo "</A><BR><BR>";
    echo "      </TD>";
    echo "   </TR>";
    echo "   <TR BGCOLOR=DCDCDC WIDTH=100%>";
    echo "      <TD ALIGN=CENTER>";
-   echo "         <FONT FACE=\"Arial,Helvetica\"><BR></FONT>";
+   echo "         <BR>";
    echo "      </TD>";
    echo "   </TR>";
    echo "</TABLE>";
-- 
2.25.1