diff --git a/header.inc.php b/header.inc.php
index 50f50493e..5862217e7 100644
--- a/header.inc.php
+++ b/header.inc.php
@@ -2,154 +2,157 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
-/**
- * Gets a core script and starts output buffering work
- */
-require_once('./libraries/common.lib.php');
-require_once('./libraries/ob.lib.php');
-if ($GLOBALS['cfg']['OBGzip']) {
-    $GLOBALS['ob_mode'] = PMA_outBufferModeGet();
-    if ($GLOBALS['ob_mode']) {
-        PMA_outBufferPre($GLOBALS['ob_mode']);
-    }
-}
+if (empty($GLOBALS['is_header_sent'])) {
 
-// garvin: For re-usability, moved http-headers and stylesheets
-// to a seperate file. It can now be included by header.inc.php,
-// queryframe.php, querywindow.php.
-
-require_once('./libraries/header_http.inc.php');
-require_once('./libraries/header_meta_style.inc.php');
-
-$title     = '';
-if (isset($GLOBALS['db'])) {
-    $title .= str_replace('\'', '\\\'', $GLOBALS['db']);
-}
-if (isset($GLOBALS['table'])) {
-    $title .= (empty($title) ? '' : '.') . str_replace('\'', '\\\'', $GLOBALS['table']);
-}
-if (!empty($GLOBALS['cfg']['Server']) && isset($GLOBALS['cfg']['Server']['host'])) {
-    $title .= (empty($title) ? 'phpMyAdmin ' : ' ')
-           . sprintf($GLOBALS['strRunning'], (empty($GLOBALS['cfg']['Server']['verbose']) ? str_replace('\'', '\\\'', $GLOBALS['cfg']['Server']['host']) : str_replace('\'', '\\\'', $GLOBALS['cfg']['Server']['verbose'])));
-}
-$title     .= (empty($title) ? '' : ' - ') . 'phpMyAdmin ' . PMA_VERSION;
-?>
-<script type="text/javascript" language="javascript">
-<!--
-// Updates the title of the frameset if possible (ns4 does not allow this)
-if (typeof(parent.document) != 'undefined' && typeof(parent.document) != 'unknown'
-    && typeof(parent.document.title) == 'string') {
-    parent.document.title = '<?php echo $title; ?>';
-}
-<?php
-// Add some javascript instructions if required
-if (isset($js_to_run) && $js_to_run == 'functions.js') {
-    echo "\n";
-    ?>
-// js form validation stuff
-var errorMsg0   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strFormEmpty']); ?>';
-var errorMsg1   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strNotNumber']); ?>';
-var errorMsg2   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strNotValidNumber']); ?>';
-var noDropDbMsg = '<?php echo((!$GLOBALS['cfg']['AllowUserDropDatabase']) ? str_replace('\'', '\\\'', $GLOBALS['strNoDropDatabases']) : ''); ?>';
-var confirmMsg  = '<?php echo(($GLOBALS['cfg']['Confirm']) ? str_replace('\'', '\\\'', $GLOBALS['strDoYouReally']) : ''); ?>';
-//-->
-</script>
-<script src="libraries/functions.js" type="text/javascript" language="javascript"></script>
-    <?php
-} else if (isset($js_to_run) && $js_to_run == 'user_password.js') {
-    echo "\n";
-    ?>
-// js form validation stuff
-var jsHostEmpty       = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strHostEmpty']); ?>';
-var jsUserEmpty       = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strUserEmpty']); ?>';
-var jsPasswordEmpty   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordEmpty']); ?>';
-var jsPasswordNotSame = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordNotSame']); ?>';
-//-->
-</script>
-<script src="libraries/user_password.js" type="text/javascript" language="javascript"></script>
-    <?php
-} else if (isset($js_to_run) && $js_to_run == 'server_privileges.js') {
-    echo "\n";
-    ?>
-// js form validation stuff
-var jsHostEmpty       = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strHostEmpty']); ?>';
-var jsUserEmpty       = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strUserEmpty']); ?>';
-var jsPasswordEmpty   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordEmpty']); ?>';
-var jsPasswordNotSame = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordNotSame']); ?>';
-//-->
-</script>
-<script src="libraries/server_privileges.js" type="text/javascript" language="javascript"></script>
-    <?php
-} else if (isset($js_to_run) && $js_to_run == 'indexes.js') {
-    echo "\n";
-    ?>
-// js index validation stuff
-var errorMsg0   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strFormEmpty']); ?>';
-var errorMsg1   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strNotNumber']); ?>';
-var errorMsg2   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strNotValidNumber']); ?>';
-//-->
-</script>
-<script src="libraries/indexes.js" type="text/javascript" language="javascript"></script>
-    <?php
-} else if (isset($js_to_run) && $js_to_run == 'tbl_change.js') {
-    echo "\n";
-    ?>
-//-->
-</script>
-<script src="libraries/tbl_change.js" type="text/javascript" language="javascript"></script>
-    <?php
-} else {
-    echo "\n";
-    ?>
-//-->
-</script>
-    <?php
-}
-echo "\n";
-?>
-    <meta name="OBGZip" content="<?php echo ($cfg['OBGzip'] ? 'true' : 'false'); ?>" />
-</head>
-
-
-<?php
-if ($GLOBALS['cfg']['RightBgImage'] != '') {
-    $bkg_img = ' background="' . $GLOBALS['cfg']['RightBgImage'] . '"';
-} else {
-    $bkg_img = '';
-}
-?>
-<body bgcolor="<?php echo $GLOBALS['cfg']['RightBgColor'] . '"' . $bkg_img; ?>>
-<?php
-if (!defined('PMA_DISPLAY_HEADING')) {
-    define('PMA_DISPLAY_HEADING', 1);
-}
-if (PMA_DISPLAY_HEADING) {
-    $header_url_qry = '?' . PMA_generate_common_url();
-    echo '<h1>' . "\n";
-    $server_info = (!empty($cfg['Server']['verbose'])
-                    ? $cfg['Server']['verbose']
-                    : $server_info = $cfg['Server']['host'] . (empty($cfg['Server']['port'])
-                                                               ? ''
-                                                               : ':' . $cfg['Server']['port']
-                                                              )
-                   );
-    if (isset($GLOBALS['db'])) {
-        echo '    ' . $GLOBALS['strDatabase'] . ' <i><a class="h1" href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . $header_url_qry . '&amp;db=' . urlencode($GLOBALS['db']) . '">' . htmlspecialchars($GLOBALS['db']) . '</a></i>' . "\n";
-        if (!empty($GLOBALS['table'])) {
-            echo '    - ' . $GLOBALS['strTable'] . ' <i><a class="h1" href="' . $GLOBALS['cfg']['DefaultTabTable'] . $header_url_qry . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;table=' . urlencode($GLOBALS['table']) . '">' . htmlspecialchars($GLOBALS['table']) . '</a></i>' . "\n";
+    /**
+     * Gets a core script and starts output buffering work
+     */
+    require_once('./libraries/common.lib.php');
+    require_once('./libraries/ob.lib.php');
+    if ($GLOBALS['cfg']['OBGzip']) {
+        $GLOBALS['ob_mode'] = PMA_outBufferModeGet();
+        if ($GLOBALS['ob_mode']) {
+            PMA_outBufferPre($GLOBALS['ob_mode']);
         }
-        echo '    ' . sprintf($GLOBALS['strRunning'], '<i><a class="h1" href="' . $GLOBALS['cfg']['DefaultTabServer'] . $header_url_qry . '">' . htmlspecialchars($server_info) . '</a></i>');
-    } else {
-        echo '    ' . sprintf($GLOBALS['strServer'], '<i><a class="h1" href="' . $GLOBALS['cfg']['DefaultTabServer'] . $header_url_qry . '">' . htmlspecialchars($server_info) . '</a></i>');
     }
-    echo "\n" . '</h1>' . "\n";
+
+    // garvin: For re-usability, moved http-headers and stylesheets
+    // to a seperate file. It can now be included by header.inc.php,
+    // queryframe.php, querywindow.php.
+
+    require_once('./libraries/header_http.inc.php');
+    require_once('./libraries/header_meta_style.inc.php');
+
+    $title     = '';
+    if (isset($GLOBALS['db'])) {
+        $title .= str_replace('\'', '\\\'', $GLOBALS['db']);
+    }
+    if (isset($GLOBALS['table'])) {
+        $title .= (empty($title) ? '' : '.') . str_replace('\'', '\\\'', $GLOBALS['table']);
+    }
+    if (!empty($GLOBALS['cfg']['Server']) && isset($GLOBALS['cfg']['Server']['host'])) {
+        $title .= (empty($title) ? 'phpMyAdmin ' : ' ')
+               . sprintf($GLOBALS['strRunning'], (empty($GLOBALS['cfg']['Server']['verbose']) ? str_replace('\'', '\\\'', $GLOBALS['cfg']['Server']['host']) : str_replace('\'', '\\\'', $GLOBALS['cfg']['Server']['verbose'])));
+    }
+    $title     .= (empty($title) ? '' : ' - ') . 'phpMyAdmin ' . PMA_VERSION;
+    ?>
+    <script type="text/javascript" language="javascript">
+    <!--
+    // Updates the title of the frameset if possible (ns4 does not allow this)
+    if (typeof(parent.document) != 'undefined' && typeof(parent.document) != 'unknown'
+        && typeof(parent.document.title) == 'string') {
+        parent.document.title = '<?php echo $title; ?>';
+    }
+    <?php
+    // Add some javascript instructions if required
+    if (isset($js_to_run) && $js_to_run == 'functions.js') {
+        echo "\n";
+        ?>
+    // js form validation stuff
+    var errorMsg0   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strFormEmpty']); ?>';
+    var errorMsg1   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strNotNumber']); ?>';
+    var errorMsg2   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strNotValidNumber']); ?>';
+    var noDropDbMsg = '<?php echo((!$GLOBALS['cfg']['AllowUserDropDatabase']) ? str_replace('\'', '\\\'', $GLOBALS['strNoDropDatabases']) : ''); ?>';
+    var confirmMsg  = '<?php echo(($GLOBALS['cfg']['Confirm']) ? str_replace('\'', '\\\'', $GLOBALS['strDoYouReally']) : ''); ?>';
+    //-->
+    </script>
+    <script src="libraries/functions.js" type="text/javascript" language="javascript"></script>
+        <?php
+    } else if (isset($js_to_run) && $js_to_run == 'user_password.js') {
+        echo "\n";
+        ?>
+    // js form validation stuff
+    var jsHostEmpty       = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strHostEmpty']); ?>';
+    var jsUserEmpty       = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strUserEmpty']); ?>';
+    var jsPasswordEmpty   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordEmpty']); ?>';
+    var jsPasswordNotSame = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordNotSame']); ?>';
+    //-->
+    </script>
+    <script src="libraries/user_password.js" type="text/javascript" language="javascript"></script>
+        <?php
+    } else if (isset($js_to_run) && $js_to_run == 'server_privileges.js') {
+        echo "\n";
+        ?>
+    // js form validation stuff
+    var jsHostEmpty       = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strHostEmpty']); ?>';
+    var jsUserEmpty       = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strUserEmpty']); ?>';
+    var jsPasswordEmpty   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordEmpty']); ?>';
+    var jsPasswordNotSame = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordNotSame']); ?>';
+    //-->
+    </script>
+    <script src="libraries/server_privileges.js" type="text/javascript" language="javascript"></script>
+        <?php
+    } else if (isset($js_to_run) && $js_to_run == 'indexes.js') {
+        echo "\n";
+        ?>
+    // js index validation stuff
+    var errorMsg0   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strFormEmpty']); ?>';
+    var errorMsg1   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strNotNumber']); ?>';
+    var errorMsg2   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strNotValidNumber']); ?>';
+    //-->
+    </script>
+    <script src="libraries/indexes.js" type="text/javascript" language="javascript"></script>
+        <?php
+    } else if (isset($js_to_run) && $js_to_run == 'tbl_change.js') {
+        echo "\n";
+        ?>
+    //-->
+    </script>
+    <script src="libraries/tbl_change.js" type="text/javascript" language="javascript"></script>
+        <?php
+    } else {
+        echo "\n";
+        ?>
+    //-->
+    </script>
+        <?php
+    }
+    echo "\n";
+    ?>
+        <meta name="OBGZip" content="<?php echo ($cfg['OBGzip'] ? 'true' : 'false'); ?>" />
+    </head>
+
+
+    <?php
+    if ($GLOBALS['cfg']['RightBgImage'] != '') {
+        $bkg_img = ' background="' . $GLOBALS['cfg']['RightBgImage'] . '"';
+    } else {
+        $bkg_img = '';
+    }
+    ?>
+    <body bgcolor="<?php echo $GLOBALS['cfg']['RightBgColor'] . '"' . $bkg_img; ?>>
+    <?php
+    if (!defined('PMA_DISPLAY_HEADING')) {
+        define('PMA_DISPLAY_HEADING', 1);
+    }
+    if (PMA_DISPLAY_HEADING) {
+        $header_url_qry = '?' . PMA_generate_common_url();
+        echo '<h1>' . "\n";
+        $server_info = (!empty($cfg['Server']['verbose'])
+                        ? $cfg['Server']['verbose']
+                        : $server_info = $cfg['Server']['host'] . (empty($cfg['Server']['port'])
+                                                                   ? ''
+                                                                   : ':' . $cfg['Server']['port']
+                                                                  )
+                       );
+        if (isset($GLOBALS['db'])) {
+            echo '    ' . $GLOBALS['strDatabase'] . ' <i><a class="h1" href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . $header_url_qry . '&amp;db=' . urlencode($GLOBALS['db']) . '">' . htmlspecialchars($GLOBALS['db']) . '</a></i>' . "\n";
+            if (!empty($GLOBALS['table'])) {
+                echo '    - ' . $GLOBALS['strTable'] . ' <i><a class="h1" href="' . $GLOBALS['cfg']['DefaultTabTable'] . $header_url_qry . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;table=' . urlencode($GLOBALS['table']) . '">' . htmlspecialchars($GLOBALS['table']) . '</a></i>' . "\n";
+            }
+            echo '    ' . sprintf($GLOBALS['strRunning'], '<i><a class="h1" href="' . $GLOBALS['cfg']['DefaultTabServer'] . $header_url_qry . '">' . htmlspecialchars($server_info) . '</a></i>');
+        } else {
+            echo '    ' . sprintf($GLOBALS['strServer'], '<i><a class="h1" href="' . $GLOBALS['cfg']['DefaultTabServer'] . $header_url_qry . '">' . htmlspecialchars($server_info) . '</a></i>');
+        }
+        echo "\n" . '</h1>' . "\n";
+    }
+    echo "\n";
+
+
+    /**
+     * Sets a variable to remember headers have been sent
+     */
+    $GLOBALS['is_header_sent'] = TRUE;
 }
-echo "\n";
-
-
-/**
- * Sets a variable to remember headers have been sent
- */
-$GLOBALS['is_header_sent'] = TRUE;
 
 ?>