diff --git a/ChangeLog b/ChangeLog
index 145a9a4c3..6ec89cecf 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,9 @@ $Source$
       (bug #1397061 Left frame not loaded correct on MySQL error)
     * libraries/common.lib.php, left.php:
       bug #1392924 undefined index: tab_count
+    * libraries/display_export.lib.php, css/phpmyadmin.css.php,
+      themes/*/css/theme_right.css.php:
+      'fixed' layout of export screen for buggy safari and opera
 
 2006-01-12 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html: typo, thanks to Cédric Corazza
diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index 156ffc5dc..3d061b9e3 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -225,11 +225,6 @@ fieldset div[class=formelement] select {
     height: auto;
 }
 
-#fieldsetexport #exportoptions {
-    float: left;
-}
-
-
 /* Calendar */
 table.calendar      { width: 100%; }
 table.calendar td   { text-align: center; }
@@ -686,6 +681,14 @@ li#li_flush_privileges {
     min-width: 48%;
     float: <?php echo $left; ?>;
 }
+
+#qbe_div_table_list {
+    float: <?php echo $left; ?>;
+}
+
+#qbe_div_sql_query {
+    float: <?php echo $left; ?>;
+}
     <?php
 } // end styles 2.7.1
 
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 376a77143..764636acd 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -120,6 +120,15 @@ function show_checked_option() {
 <fieldset id="fieldsetexport">
 <legend><?php echo $export_page_title; ?></legend>
 
+<?php
+/* 
+ * this table is needed to fix rendering in Opera <= 9 and Safari <= 2
+ * normaly just the two fieldset would have float: left
+ */
+?>
+<table><tr><td>
+
+<div id="div_container_exportoptions">
 <fieldset id="exportoptions">
 <legend><?php echo $strExport; ?></legend>
 
@@ -234,7 +243,11 @@ function show_checked_option() {
 <?php } ?>
 
 </fieldset>
+</div>
 
+</td><td>
+
+<div id="div_container_sub_exportoptions">
 <?php if ( ! $hide_sql ) { /* SQL options */ ?>
 <fieldset id="sql_options">
     <legend>
@@ -251,7 +264,7 @@ function show_checked_option() {
     ?>
     </legend>
     <div class="formelementrow">
-        <?php echo $strAddHeaderComment; ?>:
+        <?php echo $strAddHeaderComment; ?>:<br />
         <input type="text" name="header_comment" size="30"
             value="<?php echo $cfg['Export']['sql_header_comment']; ?>" />
     </div>
@@ -748,6 +761,8 @@ function show_checked_option() {
     <input type="hidden" name="xml_data" value="xml_data" />
 </fieldset>
 
+</td></tr></table>
+
 <script type="text/javascript" language="javascript">
 //<![CDATA[
     show_checked_option();
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index 68953023d..744611986 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -607,12 +607,6 @@ span.tabcaution {
 <?php } ?>
 /* end topmenu */
 
-
-#fieldsetexport #exportoptions {
-    float: left;
-}
-
-
 /* Calendar */
 table.calendar {
     width:              100%;
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index ac5755620..279348e28 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -573,11 +573,6 @@ span.tabcaution {
 /* end topmenu */
 
 
-#fieldsetexport #exportoptions {
-    float: left;
-}
-
-
 /* Calendar */
 table.calendar {
     width:              100%;