diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 9e162a05e7..eb346c9015 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -29,7 +29,7 @@ require_once './libraries/plugin_interface.lib.php';
 function PMA_exportCheckboxCheck($str)
 {
     if (isset($GLOBALS['cfg']['Export'][$str]) && $GLOBALS['cfg']['Export'][$str]) {
-        echo ' checked="checked"';
+        return ' checked="checked"';
     }
 }
 
@@ -51,24 +51,28 @@ if (empty($export_list)) {
     exit;
 }
 
-echo '<form method="post" action="export.php" name="dump" class="disableAjax">';
+$html = "";
+$html .= '<form method="post" action="export.php" '
+    . ' name="dump" class="disableAjax">';
 
 if ($export_type == 'server') {
-    echo PMA_generate_common_hidden_inputs('', '', 1);
+    $html .= PMA_generate_common_hidden_inputs('', '', 1);
 } elseif ($export_type == 'database') {
-    echo PMA_generate_common_hidden_inputs($db, '', 1);
+    $html .= PMA_generate_common_hidden_inputs($db, '', 1);
 } else {
-    echo PMA_generate_common_hidden_inputs($db, $table, 1);
+    $html .= PMA_generate_common_hidden_inputs($db, $table, 1);
 }
 
 // just to keep this value for possible next display of this form after saving
 // on server
 if (isset($single_table)) {
-    echo '<input type="hidden" name="single_table" value="TRUE" />' . "\n";
+    $html .= '<input type="hidden" name="single_table" value="TRUE" />' 
+        . "\n";
 }
 
-echo '<input type="hidden" name="export_type" value="' . $export_type . '" />';
-echo "\n";
+$html .= '<input type="hidden" name="export_type" value="' 
+    . $export_type . '" />';
+$html .= "\n";
 
 // If the export method was not set, the default is quick
 if (isset($_GET['export_method'])) {
@@ -77,30 +81,30 @@ if (isset($_GET['export_method'])) {
     $cfg['Export']['method'] = 'quick';
 }
 // The export method (quick, custom or custom-no-form)
-echo '<input type="hidden" name="export_method" value="'
+$html .= '<input type="hidden" name="export_method" value="'
     . htmlspecialchars($cfg['Export']['method']) . '" />';
 
 
 if (isset($_GET['sql_query'])) {
-    echo '<input type="hidden" name="sql_query" value="'
+    $html .= '<input type="hidden" name="sql_query" value="'
         . htmlspecialchars($_GET['sql_query']) . '" />' . "\n";
 } elseif (! empty($sql_query)) {
-    echo '<input type="hidden" name="sql_query" value="'
+    $html .= '<input type="hidden" name="sql_query" value="'
         . htmlspecialchars($sql_query) . '" />' . "\n";
 }
 
-echo '<div class="exportoptions" id="header">';
-echo '<h2>';
-echo PMA_Util::getImage('b_export.png', __('Export'));
+$html .= '<div class="exportoptions" id="header">';
+$html .= '<h2>';
+$html .= PMA_Util::getImage('b_export.png', __('Export'));
 if ($export_type == 'server') {
-    echo __('Exporting databases from the current server');
+    $html .= __('Exporting databases from the current server');
 } elseif ($export_type == 'database') {
     printf(__('Exporting tables from "%s" database'), htmlspecialchars($db));
 } else {
     printf(__('Exporting rows from "%s" table'), htmlspecialchars($table));
 }
-echo '</h2>';
-echo '</div>';
+$html .= '</h2>';
+$html .= '</div>';
 
 if (isset($_GET['quick_or_custom'])) {
     $export_method = $_GET['quick_or_custom'];
@@ -108,162 +112,163 @@ if (isset($_GET['quick_or_custom'])) {
     $export_method = $cfg['Export']['method'];
 }
 
-echo '<div class="exportoptions" id="quick_or_custom">';
-echo '<h3>' . __('Export Method:') . '</h3>';
-echo '<ul>';
-echo '<li>';
-echo '<input type="radio" name="quick_or_custom" value="quick" '
+$html .= '<div class="exportoptions" id="quick_or_custom">';
+$html .= '<h3>' . __('Export Method:') . '</h3>';
+$html .= '<ul>';
+$html .= '<li>';
+$html .= '<input type="radio" name="quick_or_custom" value="quick" '
     . ' id="radio_quick_export"';
 if ($export_method == 'quick' || $export_method == 'quick_no_form') {
-    echo ' checked="checked"';
+    $html .= ' checked="checked"';
 }
-echo ' />';
-echo '<label for ="radio_quick_export">';
-echo __('Quick - display only the minimal options');
-echo '</label>';
-echo '</li>';
+$html .= ' />';
+$html .= '<label for ="radio_quick_export">';
+$html .= __('Quick - display only the minimal options');
+$html .= '</label>';
+$html .= '</li>';
 
-echo '<li>';
-echo '<input type="radio" name="quick_or_custom" value="custom" '
+$html .= '<li>';
+$html .= '<input type="radio" name="quick_or_custom" value="custom" '
     . ' id="radio_custom_export"';
 if ($export_method == 'custom' || $export_method == 'custom_no_form') {
-    echo ' checked="checked"';
+    $html .= ' checked="checked"';
 }
-echo ' />';
-echo '<label for="radio_custom_export">';
-echo __('Custom - display all possible options');
-echo '</label>';
-echo '</li>';
+$html .= ' />';
+$html .= '<label for="radio_custom_export">';
+$html .= __('Custom - display all possible options');
+$html .= '</label>';
+$html .= '</li>';
 
-echo '</ul>';
-echo '</div>';
+$html .= '</ul>';
+$html .= '</div>';
 
-echo '<div class="exportoptions" id="databases_and_tables">';
+$html .= '<div class="exportoptions" id="databases_and_tables">';
 if ($export_type == 'server') {
-    echo '<h3>' . __('Database(s):') . '</h3>';
+    $html .= '<h3>' . __('Database(s):') . '</h3>';
 } else if ($export_type == 'database') {
-    echo '<h3>' . __('Table(s):') . '</h3>';
+    $html .= '<h3>' . __('Table(s):') . '</h3>';
 }
 if (! empty($multi_values)) {
-    echo $multi_values;
+    $html .= $multi_values;
 }
-echo '</div>';
+$html .= '</div>';
 
 if (strlen($table) && ! isset($num_tables) && ! PMA_Table::isMerge($db, $table)) {
-    echo '<div class="exportoptions" id="rows">';
-    echo '<h3>' . __('Rows:') . '</h3>';
-    echo '<ul>';
-    echo '<li>';
-    echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0"';
+    $html .= '<div class="exportoptions" id="rows">';
+    $html .= '<h3>' . __('Rows:') . '</h3>';
+    $html .= '<ul>';
+    $html .= '<li>';
+    $html .= '<input type="radio" name="allrows" value="0" id="radio_allrows_0"';
     if (isset($_GET['allrows']) && $_GET['allrows'] == 0) {
-        echo ' checked="checked"';
+        $html .= ' checked="checked"';
     }
-    echo '/>';
-    echo '<label for ="radio_allrows_0">' . __('Dump some row(s)') . '</label>';
-    echo '<ul>';
-    echo '<li>';
-    echo '<label for="limit_to">' . __('Number of rows:') . '</label>';
-    echo '<input type="text" id="limit_to" name="limit_to" size="5" value="';
+    $html .= '/>';
+    $html .= '<label for ="radio_allrows_0">' . __('Dump some row(s)') . '</label>';
+    $html .= '<ul>';
+    $html .= '<li>';
+    $html .= '<label for="limit_to">' . __('Number of rows:') . '</label>';
+    $html .= '<input type="text" id="limit_to" name="limit_to" size="5" value="';
     if (isset($_GET['limit_to'])) {
-        echo htmlspecialchars($_GET['limit_to']);
+        $html .= htmlspecialchars($_GET['limit_to']);
     } elseif (isset($unlim_num_rows)) {
-        echo $unlim_num_rows;
+        $html .= $unlim_num_rows;
     } else {
-        echo PMA_Table::countRecords($db, $table);
+        $html .= PMA_Table::countRecords($db, $table);
     }
-    echo '" onfocus="this.select()" />';
-    echo '</li>';
-    echo '<li>';
-    echo '<label for="limit_from">' . __('Row to begin at:') . '</label>';
-    echo '<input type="text" id="limit_from" name="limit_from" value="';
+    $html .= '" onfocus="this.select()" />';
+    $html .= '</li>';
+    $html .= '<li>';
+    $html .= '<label for="limit_from">' . __('Row to begin at:') . '</label>';
+    $html .= '<input type="text" id="limit_from" name="limit_from" value="';
     if (isset($_GET['limit_from'])) {
-        echo htmlspecialchars($_GET['limit_from']);
+        $html .= htmlspecialchars($_GET['limit_from']);
     } else {
-        echo '0';
+        $html .= '0';
     }
-    echo '" size="5" onfocus="this.select()" />';
-    echo '</li>';
-    echo '</ul>';
-    echo '</li>';
-    echo '<li>';
-    echo '<input type="radio" name="allrows" value="1" id="radio_allrows_1"';
+    $html .= '" size="5" onfocus="this.select()" />';
+    $html .= '</li>';
+    $html .= '</ul>';
+    $html .= '</li>';
+    $html .= '<li>';
+    $html .= '<input type="radio" name="allrows" value="1" id="radio_allrows_1"';
     if (! isset($_GET['allrows']) || $_GET['allrows'] == 1) {
-        echo ' checked="checked"';
+        $html .= ' checked="checked"';
     }
-    echo '/>';
-    echo ' <label for="radio_allrows_1">' . __('Dump all rows') . '</label>';
-    echo '</li>';
-    echo '</ul>';
-    echo '</div>';
+    $html .= '/>';
+    $html .= ' <label for="radio_allrows_1">' . __('Dump all rows') . '</label>';
+    $html .= '</li>';
+    $html .= '</ul>';
+    $html .= '</div>';
 }
 
 if (isset($cfg['SaveDir']) && !empty($cfg['SaveDir'])) {
-    echo '<div class="exportoptions" id="output_quick_export">';
-    echo '<h3>' . __('Output:') . '</h3>';
-    echo '<ul>';
-    echo '<li>';
-    echo '<input type="checkbox" name="quick_export_onserver" value="saveit" ';
-    echo 'id="checkbox_quick_dump_onserver" ';
-    PMA_exportCheckboxCheck('quick_export_onserver');
-    echo '/>';
-    echo '<label for="checkbox_quick_dump_onserver">';
+    $html .= '<div class="exportoptions" id="output_quick_export">';
+    $html .= '<h3>' . __('Output:') . '</h3>';
+    $html .= '<ul>';
+    $html .= '<li>';
+    $html .= '<input type="checkbox" name="quick_export_onserver" value="saveit" ';
+    $html .= 'id="checkbox_quick_dump_onserver" ';
+    $html .= PMA_exportCheckboxCheck('quick_export_onserver');
+    $html .= '/>';
+    $html .= '<label for="checkbox_quick_dump_onserver">';
     printf(
         __('Save on server in the directory <b>%s</b>'),
         htmlspecialchars(PMA_Util::userDir($cfg['SaveDir']))
     );
-    echo '</label>';
-    echo '</li>';
-    echo '<li>';
-    echo '<input type="checkbox" name="quick_export_onserverover" ';
-    echo 'value="saveitover" id="checkbox_quick_dump_onserverover" ';
-    PMA_exportCheckboxCheck('quick_export_onserver_overwrite');
-    echo '/>';
-    echo '<label for="checkbox_quick_dump_onserverover">';
-    echo __('Overwrite existing file(s)');
-    echo '</label>';
-    echo '</li>';
-    echo '</ul>';
-    echo '</div>';
+    $html .= '</label>';
+    $html .= '</li>';
+    $html .= '<li>';
+    $html .= '<input type="checkbox" name="quick_export_onserverover" ';
+    $html .= 'value="saveitover" id="checkbox_quick_dump_onserverover" ';
+    $html .= PMA_exportCheckboxCheck('quick_export_onserver_overwrite');
+    $html .= '/>';
+    $html .= '<label for="checkbox_quick_dump_onserverover">';
+    $html .= __('Overwrite existing file(s)');
+    $html .= '</label>';
+    $html .= '</li>';
+    $html .= '</ul>';
+    $html .= '</div>';
 }
 
-echo '<div class="exportoptions" id="output">';
-echo '<h3>' . __('Output:') . '</h3>';
-echo '<ul id="ul_output">';
-echo '<li>';
-echo '<input type="radio" name="output_format" value="sendit" ';
-echo 'id="radio_dump_asfile" ';
+$html .= '<div class="exportoptions" id="output">';
+$html .= '<h3>' . __('Output:') . '</h3>';
+$html .= '<ul id="ul_output">';
+$html .= '<li>';
+$html .= '<input type="radio" name="output_format" value="sendit" ';
+$html .= 'id="radio_dump_asfile" ';
 if (!isset($_GET['repopulate'])) {
-    PMA_exportCheckboxCheck('asfile');
+    $html .= PMA_exportCheckboxCheck('asfile');
 }
-echo '/>';
-echo '<label for="radio_dump_asfile">' . __('Save output to a file') . '</label>';
-echo '<ul id="ul_save_asfile">';
+$html .= '/>';
+$html .= '<label for="radio_dump_asfile">' 
+    . __('Save output to a file') . '</label>';
+$html .= '<ul id="ul_save_asfile">';
 if (isset($cfg['SaveDir']) && !empty($cfg['SaveDir'])) {
-    echo '<li>';
-    echo '<input type="checkbox" name="onserver" value="saveit" ';
-    echo 'id="checkbox_dump_onserver" ';
-    PMA_exportCheckboxCheck('onserver');
-    echo '/>';
-    echo '<label for="checkbox_dump_onserver">';
+    $html .= '<li>';
+    $html .= '<input type="checkbox" name="onserver" value="saveit" ';
+    $html .= 'id="checkbox_dump_onserver" ';
+    $html .= PMA_exportCheckboxCheck('onserver');
+    $html .= '/>';
+    $html .= '<label for="checkbox_dump_onserver">';
     printf(
         __('Save on server in the directory <b>%s</b>'),
         htmlspecialchars(PMA_Util::userDir($cfg['SaveDir']))
     );
-    echo '</label>';
-    echo '</li>';
-    echo '<li>';
-    echo '<input type="checkbox" name="onserverover" value="saveitover"';
-    echo ' id="checkbox_dump_onserverover" ';
-    PMA_exportCheckboxCheck('onserver_overwrite');
-    echo '/>';
-    echo '<label for="checkbox_dump_onserverover">';
-    echo __('Overwrite existing file(s)');
-    echo '</label>';
-    echo '</li>';
+    $html .= '</label>';
+    $html .= '</li>';
+    $html .= '<li>';
+    $html .= '<input type="checkbox" name="onserverover" value="saveitover"';
+    $html .= ' id="checkbox_dump_onserverover" ';
+    $html .= PMA_exportCheckboxCheck('onserver_overwrite');
+    $html .= '/>';
+    $html .= '<label for="checkbox_dump_onserverover">';
+    $html .= __('Overwrite existing file(s)');
+    $html .= '</label>';
+    $html .= '</li>';
 }
-echo '<li>';
-echo '<label for="filename_template" class="desc">';
-echo __('File name template:');
+$html .= '<li>';
+$html .= '<label for="filename_template" class="desc">';
+$html .= __('File name template:');
 $trans = new PMA_Message;
 $trans->addMessage(__('@SERVER@ will become the server name'));
 if ($export_type == 'database' || $export_type == 'table') {
@@ -290,29 +295,29 @@ $msg->addParam(
 );
 $msg->addParam('</a>', false);
 
-echo PMA_Util::showHint($msg);
-echo '</label>';
-echo '<input type="text" name="filename_template" id="filename_template" ';
-echo ' value="';
+$html .= PMA_Util::showHint($msg);
+$html .= '</label>';
+$html .= '<input type="text" name="filename_template" id="filename_template" ';
+$html .= ' value="';
 if (isset($_GET['filename_template'])) {
-    echo htmlspecialchars($_GET['filename_template']);
+    $html .= htmlspecialchars($_GET['filename_template']);
 } else {
     if ($export_type == 'database') {
-        echo htmlspecialchars(
+        $html .= htmlspecialchars(
             $GLOBALS['PMA_Config']->getUserValue(
                 'pma_db_filename_template',
                 $GLOBALS['cfg']['Export']['file_template_database']
             )
         );
     } elseif ($export_type == 'table') {
-        echo htmlspecialchars(
+        $html .= htmlspecialchars(
             $GLOBALS['PMA_Config']->getUserValue(
                 'pma_table_filename_template',
                 $GLOBALS['cfg']['Export']['file_template_table']
             )
         );
     } else {
-        echo htmlspecialchars(
+        $html .= htmlspecialchars(
             $GLOBALS['PMA_Config']->getUserValue(
                 'pma_server_filename_template',
                 $GLOBALS['cfg']['Export']['file_template_server']
@@ -320,36 +325,36 @@ if (isset($_GET['filename_template'])) {
         );
     }
 }
-echo '"';
-echo '/>';
-echo '<input type="checkbox" name="remember_template" ';
-echo 'id="checkbox_remember_template" ';
-PMA_exportCheckboxCheck('remember_file_template');
-echo '/>';
-echo '<label for="checkbox_remember_template">';
-echo __('use this for future exports');
-echo '</label>';
-echo '</li>';
+$html .= '"';
+$html .= '/>';
+$html .= '<input type="checkbox" name="remember_template" ';
+$html .= 'id="checkbox_remember_template" ';
+$html .= PMA_exportCheckboxCheck('remember_file_template');
+$html .= '/>';
+$html .= '<label for="checkbox_remember_template">';
+$html .= __('use this for future exports');
+$html .= '</label>';
+$html .= '</li>';
 // charset of file
 if ($GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE) {
-    echo '        <li><label for="select_charset_of_file" class="desc">'
+    $html .= '        <li><label for="select_charset_of_file" class="desc">'
         . __('Character set of the file:') . '</label>' . "\n";
     reset($cfg['AvailableCharsets']);
-    echo '<select id="select_charset_of_file" name="charset_of_file" size="1">';
+    $html .= '<select id="select_charset_of_file" name="charset_of_file" size="1">';
     foreach ($cfg['AvailableCharsets'] as $temp_charset) {
-        echo '<option value="' . $temp_charset . '"';
+        $html .= '<option value="' . $temp_charset . '"';
         if (isset($_GET['charset_of_file'])
             && ($_GET['charset_of_file'] != $temp_charset)
         ) {
-            echo '';
+            $html .= '';
         } elseif ((empty($cfg['Export']['charset']) && $temp_charset == 'utf-8')
             || $temp_charset == $cfg['Export']['charset']
         ) {
-            echo ' selected="selected"';
+            $html .= ' selected="selected"';
         }
-        echo '>' . $temp_charset . '</option>';
+        $html .= '>' . $temp_charset . '</option>';
     } // end foreach
-    echo '</select></li>';
+    $html .= '</select></li>';
 } // end if
 
 if (isset($_GET['compression'])) {
@@ -365,79 +370,83 @@ $is_zip  = ($cfg['ZipDump']  && @function_exists('gzcompress'));
 $is_gzip = ($cfg['GZipDump'] && @function_exists('gzencode'));
 $is_bzip2 = ($cfg['BZipDump'] && @function_exists('bzcompress'));
 if ($is_zip || $is_gzip || $is_bzip2) {
-    echo '<li>';
-    echo '<label for="compression" class="desc">' . __('Compression:') . '</label>';
-    echo '<select id="compression" name="compression">';
-    echo '<option value="none">' . __('None') . '</option>';
+    $html .= '<li>';
+    $html .= '<label for="compression" class="desc">' 
+        . __('Compression:') . '</label>';
+    $html .= '<select id="compression" name="compression">';
+    $html .= '<option value="none">' . __('None') . '</option>';
     if ($is_zip) {
-        echo '<option value="zip" ';
+        $html .= '<option value="zip" ';
         if ($selected_compression == "zip") {
-            echo 'selected="selected"';
+            $html .= 'selected="selected"';
         }
-        echo '>' . __('zipped') . '</option>';
+        $html .= '>' . __('zipped') . '</option>';
     }
     if ($is_gzip) {
-        echo '<option value="gzip" ';
+        $html .= '<option value="gzip" ';
         if ($selected_compression == "gzip") {
-            echo 'selected="selected"';
+            $html .= 'selected="selected"';
         }
-        echo '>' . __('gzipped') . '</option>';
+        $html .= '>' . __('gzipped') . '</option>';
     }
     if ($is_bzip2) {
-        echo '<option value="bzip2" ';
+        $html .= '<option value="bzip2" ';
         if ($selected_compression == "bzip2") {
-            echo 'selected="selected"';
+            $html .= 'selected="selected"';
         }
-        echo '>' . __('bzipped') . '</option>';
+        $html .= '>' . __('bzipped') . '</option>';
     }
-    echo '</select>';
-    echo '</li>';
+    $html .= '</select>';
+    $html .= '</li>';
 } else {
-    echo '<input type="hidden" name="compression" value="'
+    $html .= '<input type="hidden" name="compression" value="'
         . htmlspecialchars($selected_compression) . '" />';
 }
-echo '</ul>';
-echo '</li>';
-echo '<li>';
-echo '<input type="radio" id="radio_view_as_text" name="output_format" '
-    . 'value="astext" ';
+$html .= '</ul>';
+$html .= '</li>';
+$html .= '<li>';
+$html .= '<input type="radio" id="radio_view_as_text" ' 
+    . ' name="output_format" value="astext" ';
 if (isset($_GET['repopulate']) || $GLOBALS['cfg']['Export']['asfile'] == false) {
-    echo 'checked="checked"';
+    $html .= 'checked="checked"';
 }
-echo '/>';
-echo '<label for="radio_view_as_text">'
+$html .= '/>';
+$html .= '<label for="radio_view_as_text">'
     . __('View output as text') . '</label></li>';
-echo '</ul>';
-echo '</div>';
+$html .= '</ul>';
+$html .= '</div>';
 
-echo '<div class="exportoptions" id="format">';
-echo '<h3>' . __('Format:') . '</h3>';
-echo PMA_pluginGetChoice('Export', 'what', $export_list, 'format');
-echo '</div>';
+$html .= '<div class="exportoptions" id="format">';
+$html .= '<h3>' . __('Format:') . '</h3>';
+$html .= PMA_pluginGetChoice('Export', 'what', $export_list, 'format');
+$html .= '</div>';
 
-echo '<div class="exportoptions" id="format_specific_opts">';
-echo '<h3>' . __('Format-specific options:') . '</h3>';
-echo '<p class="no_js_msg" id="scroll_to_options_msg">';
-echo __('Scroll down to fill in the options for the selected format and ignore the options for other formats.');
-echo '</p>';
-echo PMA_pluginGetOptions('Export', $export_list);
-echo '</div>';
+$html .= '<div class="exportoptions" id="format_specific_opts">';
+$html .= '<h3>' . __('Format-specific options:') . '</h3>';
+$html .= '<p class="no_js_msg" id="scroll_to_options_msg">';
+$html .= __('Scroll down to fill in the options for the selected format and ignore the options for other formats.');
+$html .= '</p>';
+$html .= PMA_pluginGetOptions('Export', $export_list);
+$html .= '</div>';
 
 if (function_exists('PMA_set_enc_form')) {
     // Encoding setting form appended by Y.Kawada
     // Japanese encoding setting
-    echo '<div class="exportoptions" id="kanji_encoding">';
-    echo '<h3>' . __('Encoding Conversion:') . '</h3>';
-    echo PMA_set_enc_form('            ');
-    echo '</div>';
+    $html .= '<div class="exportoptions" id="kanji_encoding">';
+    $html .= '<h3>' . __('Encoding Conversion:') . '</h3>';
+    $html .= PMA_set_enc_form('            ');
+    $html .= '</div>';
 }
 
-echo '<div class="exportoptions" id="submit">';
+$html .= '<div class="exportoptions" id="submit">';
 
-echo PMA_Util::getExternalBug(
+$html .= PMA_Util::getExternalBug(
     __('SQL compatibility mode'), 'mysql', '50027', '14515'
 );
 
-echo '<input type="submit" value="' . __('Go') . '" id="buttonGo" />';
-echo '</div>';
-echo '</form>';
+$html .= '<input type="submit" value="' . __('Go') . '" id="buttonGo" />';
+$html .= '</div>';
+$html .= '</form>';
+
+$response = PMA_Response::getInstance();
+$response->addHTML($html);