diff --git a/importexport/inc/class.importexport_definitions_ui.inc.php b/importexport/inc/class.importexport_definitions_ui.inc.php
index 2c0d921d2d..ae81a22742 100644
--- a/importexport/inc/class.importexport_definitions_ui.inc.php
+++ b/importexport/inc/class.importexport_definitions_ui.inc.php
@@ -664,7 +664,7 @@ class importexport_definitions_ui
 		// init step10
 		else
 		{
-			$content['msg'] = $this->steps['wizard_step10'];
+			$content['text'] = $this->steps['wizard_step10'];
 			foreach ($this->plugins as $appname => $options)
 			{
 				if($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
@@ -713,7 +713,7 @@ class importexport_definitions_ui
 		// init step20
 		else
 		{
-			$content['msg'] = $this->steps['wizard_step20'];
+			$content['text'] = $this->steps['wizard_step20'];
 			$config = config::read('phpgwapi');
 			foreach ($this->plugins[$content['application']] as $type => $plugins) {
 				if($config['export_limit'] == 'no' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $type == 'export') continue;
@@ -787,7 +787,7 @@ class importexport_definitions_ui
 		// init step21
 		else
 		{
-			$content['msg'] = $this->steps['wizard_step21'] . ($duplicate ? "\n".$content['duplicate_error'] : '');
+			$content['text'] = $this->steps['wizard_step21'] . ($duplicate ? "\n".$content['duplicate_error'] : '');
 			$content['step'] = 'wizard_step21';
 			unset($content['duplicate_error']);
 			$preserv = $content;
@@ -828,7 +828,7 @@ class importexport_definitions_ui
 		// init step90
 		else
 		{
-			$content['msg'] = $this->steps['wizard_step90'];
+			$content['text'] = $this->steps['wizard_step90'];
 			$content['step'] = 'wizard_step90';
 			$preserv = $content;
 
@@ -864,7 +864,7 @@ class importexport_definitions_ui
 	{
 		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_finish->$content '.print_r($content,true));
 		// Take out some UI leavings
-		unset($content['msg']);
+		unset($content['text']);
 		unset($content['step']);
 		unset($content['button']);
 
diff --git a/importexport/inc/class.importexport_wizard_basic_export_csv.inc.php b/importexport/inc/class.importexport_wizard_basic_export_csv.inc.php
index ada2942ee9..98286e3d43 100644
--- a/importexport/inc/class.importexport_wizard_basic_export_csv.inc.php
+++ b/importexport/inc/class.importexport_wizard_basic_export_csv.inc.php
@@ -114,7 +114,7 @@ class importexport_wizard_basic_export_csv
 		// init step30
 		else
 		{
-			$content['msg'] = $this->steps['wizard_step30'];
+			$content['text'] = $this->steps['wizard_step30'];
 			$content['step'] = 'wizard_step30';
 			$this->export_fields += array('all_custom_fields' => 'All custom fields');
 			$sel_options['field'] = $this->export_fields;
@@ -176,7 +176,7 @@ class importexport_wizard_basic_export_csv
 		// init step40
 		else
 		{
-			$content['msg'] = $this->steps['wizard_step40'];
+			$content['text'] = $this->steps['wizard_step40'];
 			$content['step'] = 'wizard_step40';
 
 			// If editing an existing definition, these will be in plugin_options
@@ -264,7 +264,7 @@ class importexport_wizard_basic_export_csv
 		} else {
 
 			// Step 50 - filters
-			$content['msg'] = $this->steps['wizard_step80'];
+			$content['text'] = $this->steps['wizard_step80'];
 			$content['step'] = 'wizard_step80';
 			$preserv = $content;
 			unset ($preserv['button']);
diff --git a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
index d7ce4611b9..873bc68d7a 100644
--- a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
+++ b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
@@ -94,7 +94,7 @@ class importexport_wizard_basic_import_csv
 		// init step30
 		else
 		{
-			$content['msg'] = $this->steps['wizard_step30'];
+			$content['text'] = $this->steps['wizard_step30'];
 			$content['step'] = 'wizard_step30';
 			$preserv = $content;
 			unset ($preserv['button']);
@@ -124,7 +124,7 @@ class importexport_wizard_basic_import_csv
 					// Process sample file for fields
 					if (($handle = fopen($GLOBALS['egw']->session->appsession('csvfile',$content['application']), "rb")) !== FALSE) {
 						$data = fgetcsv($handle, 8000, $content['fieldsep']);
-						error_log($data);
+						//error_log(array2string($data));
 						fclose($handle);
 
 						// Remove & forget file
@@ -191,7 +191,7 @@ class importexport_wizard_basic_import_csv
 		// init step40
 		else
 		{
-			$content['msg'] = $this->steps['wizard_step40'];
+			$content['text'] = $this->steps['wizard_step40'];
 			$content['step'] = 'wizard_step40';
 
 			// If editing an existing definition, these will be in plugin_options
@@ -217,7 +217,7 @@ class importexport_wizard_basic_import_csv
 			if(!$content['update_cats'] && $content['plugin_options']['update_cats']) {
 				$content['update_cats'] = $content['plugin_options']['update_cats'];
 			}
-			if(!array_key_exists('convert', $content) && array_key_exists('convert', $content['plugin_options'])) {
+			if(!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options'])) {
 				$content['convert'] = $content['plugin_options']['convert'];
 			}
 			else
@@ -302,7 +302,7 @@ class importexport_wizard_basic_import_csv
 		// init step50
 		else
 		{
-			$content['msg'] = $this->steps['wizard_step50'];
+			$content['text'] = $this->steps['wizard_step50'];
 			$content['step'] = 'wizard_step50';
 
 			$content['mapping'] = array(false);
@@ -375,7 +375,7 @@ class importexport_wizard_basic_import_csv
 			}
 		}
 		// init step55
-		$content['msg'] = $this->steps['wizard_step55'];
+		$content['text'] = $this->steps['wizard_step55'];
 		$content['step'] = 'wizard_step55';
 
 		if(!$content['conditions'] && $content['plugin_options']['conditions']) {
diff --git a/importexport/templates/default/wizard_basic_import_csv.fieldmapping.xet b/importexport/templates/default/wizard_basic_import_csv.fieldmapping.xet
index 7f0736d382..55a15b35e6 100644
--- a/importexport/templates/default/wizard_basic_import_csv.fieldmapping.xet
+++ b/importexport/templates/default/wizard_basic_import_csv.fieldmapping.xet
@@ -13,7 +13,7 @@
 				<row>
 					<grid overflow="auto" id="mapping">
 						<columns>
-							<column/>
+							<column width="4ex"/>
 							<column/>
 							<column/>
 							<column/>
@@ -21,14 +21,12 @@
 						</columns>
 						<rows>
 							<row class="th">
-								<description/>
 								<description/>
 								<description value="CSV Field"/>
 								<description value="Target Field"/>
 								<description value="Translation"/>
 							</row>
 							<row>
-								<description value="${row}[index]" no_lang="1"/>
 								<description value="${row_cont[index]}" no_lang="1"/>
 								<description value="{$row_cont[title]}" no_lang="1"/>
 								<menulist>
diff --git a/importexport/templates/default/wizardbox.xet b/importexport/templates/default/wizardbox.xet
index ccc980869e..293e707877 100644
--- a/importexport/templates/default/wizardbox.xet
+++ b/importexport/templates/default/wizardbox.xet
@@ -10,7 +10,7 @@
 				<row valign="top">
 					<hbox no_lang="1">
 						<vbox width="100%">
-							<description/>
+							<description id="text"/>
 							<box class="wizard_content">
 								<template id="@wizard_content"/>
 							</box>
@@ -31,9 +31,9 @@
 		</grid>
 		<styles>
 			.wizard_content {
-   height: 365px;
+   height: 345px;
    width: 100%;
-   max-height:365px;
+   max-height:345px;
    overflow:auto;
 }
 		</styles>