diff --git a/question/export_form.php b/question/export_form.php
index d455055cb7c..785906abf51 100644
--- a/question/export_form.php
+++ b/question/export_form.php
@@ -10,6 +10,17 @@ class question_export_form extends moodleform {
         $defaultcategory   = $this->_customdata['defaultcategory'];
         $contexts   = $this->_customdata['contexts'];
         $defaultfilename = $this->_customdata['defaultfilename'];
+//--------------------------------------------------------------------------------
+        $mform->addElement('header','fileformat',get_string('fileformat','quiz'));
+        $fileformatnames = get_import_export_formats('export');
+        $radioarray = array();
+        foreach ($fileformatnames as $id => $fileformatname) {
+            $radioarray[] = &MoodleQuickForm::createElement('radio','format','',$fileformatname,$id);
+        }
+        $mform->addGroup($radioarray,'format','',array('<br />'),false);
+        $mform->setHelpButton('format', array('export', get_string('exportquestions', 'quiz'), 'quiz'));
+        $mform->addRule('format',null,'required',null,'client'); 
+
 //--------------------------------------------------------------------------------
         $mform->addElement('header','general', get_string('general', 'form'));
 
@@ -26,10 +37,10 @@ class question_export_form extends moodleform {
         $mform->setDefault('contexttofile', 1);
         
 
-        $fileformatnames = get_import_export_formats('export');
-        $mform->addElement('select', 'format', get_string('fileformat','quiz'), $fileformatnames);
-        $mform->setDefault('format', 'gift');
-        $mform->setHelpButton('format', array('export', get_string('exportquestions', 'quiz'), 'quiz'));
+//        $fileformatnames = get_import_export_formats('export');
+//        $mform->addElement('select', 'format', get_string('fileformat','quiz'), $fileformatnames);
+//        $mform->setDefault('format', 'gift');
+//        $mform->setHelpButton('format', array('export', get_string('exportquestions', 'quiz'), 'quiz'));
 
         $mform->addElement('text', 'exportfilename', get_string('exportname', 'quiz'), array('size'=>40));
         $mform->setDefault('exportfilename', $defaultfilename);
diff --git a/question/import_form.php b/question/import_form.php
index e3ef67a3a85..30805e2a94d 100644
--- a/question/import_form.php
+++ b/question/import_form.php
@@ -11,6 +11,18 @@ class question_import_form extends moodleform {
 
         $defaultcategory   = $this->_customdata['defaultcategory'];
         $contexts   = $this->_customdata['contexts'];
+
+//--------------------------------------------------------------------------------
+        $mform->addElement('header','fileformat', get_string('fileformat','quiz'));
+        $fileformatnames = get_import_export_formats('import');
+        $radioarray = array();
+        foreach ($fileformatnames as $id => $fileformatname) {
+            $radioarray[] = &MoodleQuickForm::createElement('radio','format','',$fileformatname,$id );
+        }
+        $mform->addGroup($radioarray,'format', '', array('<br />'), false);
+        $mform->addRule('format', null, 'required', null, 'client' );
+        $mform->setHelpButton('format', array('import', get_string('importquestions', 'quiz'), 'quiz'));
+
 //--------------------------------------------------------------------------------
         $mform->addElement('header','general', get_string('general', 'form'));
 
@@ -26,9 +38,6 @@ class question_import_form extends moodleform {
         $mform->setDefault('catfromfile', 1);
         $mform->setDefault('contextfromfile', 1);
 
-        $fileformatnames = get_import_export_formats('import');
-        $mform->addElement('select', 'format', get_string('fileformat','quiz'), $fileformatnames);
-        $mform->setDefault('format', 'gift');
 
         $matchgrades = array();
         $matchgrades['error'] = get_string('matchgradeserror','quiz');