diff --git a/ChangeLog b/ChangeLog
index 75eb590a4..473c85350 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
-2002-05-28 Loïc Chapeaux  <lolo@phpheaven.net>
+2002-06-01 Loïc Chapeaux  <lolo@phpheaven.net>
     * db_details_structure.php3, lines 440-441; Documentation.html;
       pdf_schema.php3; libraries/fpdf/*:
       - updated the FPDF library to the 1.5 revision;
@@ -16,10 +16,13 @@ $Source$
 2002-06-01 Alexander M. Turek  <rabus@users.sourceforge.net>
     * lang/indonesian.inc.php3: Updates, thanks to Rachim Tamsjadi.
     * lang/italian.inc.php3: Updates, thanks again to
-      Pietro Danesi <danone@users.sourceforge.net>.
+      Pietro Danesi <danone at users.sourceforge.net>.
     * lang/german.inc.php3: Small corrections.
     * lang/polish.inc.php3: Updates, thanks to
       Jakub Wilk <ubanus at users.sourcefore.net>.
+    * header_printview.inc.php3, libraries/display_tbl.inc.php3:
+      - Beautified generated code;
+      - XHTML / CSS fixes.
 
 2002-05-31 Alexander M. Turek  <rabus@users.sourceforge.net>
     * lang/german.inc.php3: Small corrections.
@@ -29,7 +32,7 @@ $Source$
 
 2002-05-30 Alexander M. Turek  <rabus@users.sourceforge.net>
     * lang/albanian.inc.php3: Updates, thanks again to
-      Laurent Dhima <laurenti@users.sourceforge.net>.
+      Laurent Dhima <laurent at users.sourceforge.net>.
 
 2002-05-29 Alexander M. Turek  <rabus@users.sourceforge.net>
     * lang/german.inc.php3: Translated $strPdfDbSchema.
diff --git a/header_printview.inc.php3 b/header_printview.inc.php3
index 5392b52a7..7a5d1fd11 100644
--- a/header_printview.inc.php3
+++ b/header_printview.inc.php3
@@ -69,6 +69,8 @@ td    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $fo
     <b><?php echo $strGenBy; ?>:</b> phpMyAdmin <?php echo PMA_VERSION; ?><br />
     <b><?php echo $strSQLQuery; ?>:</b> <?php echo htmlspecialchars($full_sql_query); ?>;
 </p>
+
+
 <?php
 
 /**
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index 34f0f1004..650528ebc 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -1407,11 +1407,14 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
         } // end 2b
 
         // 3. ----- Displays the results table -----
-        ?>
-<!-- Results table -->
-<table border="<?php echo $GLOBALS['cfg']['Border']; ?>" cellpadding="5">
-        <?php
-        echo "\n";
+        echo '<!-- Results table -->' . "\n"
+           . '<table ';
+        if (isset($GLOBALS['printview']) && $GLOBALS['printview'] == '1') {
+            echo 'border="1"; cellpadding="2" cellspacing="0"';
+        } else {
+            echo 'border="' . $GLOBALS['cfg']['Border'] . '" cellpadding="5"';
+        }
+        echo '>' . "\n";
         PMA_displayTableHeaders($is_display, $fields_meta, $fields_cnt);
         PMA_displayTableBody($dt_result, $is_display, $map);
         // lem9: vertical output case