diff --git a/importexport/setup/etemplates.inc.php b/importexport/setup/etemplates.inc.php
index 0cc24e8f81..c154e2afb5 100644
--- a/importexport/setup/etemplates.inc.php
+++ b/importexport/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application importexport
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2010-11-23 13:46
+	* generated by soetemplate::dump4setup() 2011-01-27 09:40
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package importexport
@@ -18,7 +18,7 @@ $templ_data[] = array('name' => 'importexport.definition_index','template' => ''
   cursor: pointer;
 }','modified' => '1290541332',);
 
-$templ_data[] = array('name' => 'importexport.export_dialog','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:1:{s:2:"c3";s:15:"save_definition";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:3:"tab";s:5:"label";s:25:"General|Selection|Options";s:4:"name";s:37:"general_tab|selection_tab|options_tab";}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:8:"checkbox";s:5:"label";s:18:"Save as definition";s:4:"name";s:18:"save_as_definition";}}i:4;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Export";s:4:"name";s:6:"export";s:7:"onclick";s:36:"xajax_eT_wrapper(this);return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:7:"Preview";s:4:"name";s:7:"preview";s:7:"onclick";s:36:"xajax_eT_wrapper(this);return false;";}}i:2;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:5:"align";s:5:"right";s:4:"name";s:6:"cancel";s:7:"onclick";s:29:"window.close(); return false;";}}}i:5;a:1:{s:1:"A";a:6:{s:4:"type";s:3:"box";s:4:"size";s:1:"1";s:4:"name";s:11:"preview-box";s:6:"needed";s:1:"1";i:1;a:1:{s:4:"type";s:5:"label";}s:4:"span";s:12:",preview-box";}}i:6;a:1:{s:1:"A";a:7:{s:4:"type";s:3:"box";s:4:"size";s:1:"1";s:4:"span";s:20:",preview-box-buttons";s:4:"name";s:19:"preview-box-buttons";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:2:"OK";s:5:"align";s:6:"center";s:7:"onclick";s:167:"document.getElementById(form::name(\'preview-box\')).style.display=\'none\'; document.getElementById(form::name(\'preview-box-buttons\')).style.display=\'none\'; return false;";}s:6:"needed";s:1:"1";s:5:"align";s:6:"center";}}}s:4:"rows";i:6;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.preview-box {
+$templ_data[] = array('name' => 'importexport.export_dialog','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:1:{s:2:"c3";s:15:"save_definition";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:3:"tab";s:5:"label";s:25:"General|Selection|Options";s:4:"name";s:37:"general_tab|selection_tab|options_tab";}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:8:"checkbox";s:5:"label";s:18:"Save as definition";s:4:"name";s:18:"save_as_definition";}}i:4;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Export";s:4:"name";s:6:"export";s:7:"onclick";s:36:"xajax_eT_wrapper(this);return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:7:"Preview";s:4:"name";s:7:"preview";s:7:"onclick";s:36:"xajax_eT_wrapper(this);return false;";}}i:2;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:5:"align";s:5:"right";s:4:"name";s:6:"cancel";s:7:"onclick";s:29:"window.close(); return false;";}}}i:5;a:1:{s:1:"A";a:6:{s:4:"type";s:3:"box";s:4:"size";s:1:"1";s:4:"name";s:11:"preview-box";s:6:"needed";s:1:"1";i:1;a:1:{s:4:"type";s:5:"label";}s:4:"span";s:12:",preview-box";}}i:6;a:1:{s:1:"A";a:7:{s:4:"type";s:3:"box";s:4:"size";s:1:"1";s:4:"span";s:20:",preview-box-buttons";s:4:"name";s:19:"preview-box-buttons";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:2:"OK";s:5:"align";s:6:"center";s:7:"onclick";s:167:"document.getElementById(form::name(\'preview-box\')).style.display=\'none\'; document.getElementById(form::name(\'preview-box-buttons\')).style.display=\'none\'; return false;";}s:6:"needed";s:1:"1";s:5:"align";s:6:"center";}}}s:4:"rows";i:6;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.preview-box {
   position: absolute;
   top: 0px;
   left: 0px;
@@ -38,11 +38,11 @@ $templ_data[] = array('name' => 'importexport.export_dialog','template' => '','l
 
   z-index: 999;
   display: none;
-}','modified' => '1158220473',);
+}','modified' => '1296146438',);
 
 $templ_data[] = array('name' => 'importexport.export_dialog.general_tab','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"export";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:46:"importexport.export_dialog.general_tab_content";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:6:",200px";s:7:"options";a:1:{i:1;s:5:"200px";}}}','size' => ',200px','style' => '','modified' => '1158223670',);
 
-$templ_data[] = array('name' => 'importexport.export_dialog.general_tab_content','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"c2";s:14:"select_appname";s:2:"c3";s:17:"select_definition";s:2:"c4";s:13:"select_plugin";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"some nice text";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Select application";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:7:"appname";s:8:"onchange";i:1;}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"Select definition";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:10:"definition";s:8:"onchange";i:1;}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Select plugin";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:8:"onchange";i:1;s:7:"no_lang";s:1:"1";s:4:"name";s:6:"plugin";}}i:5;a:2:{s:1:"A";a:6:{s:4:"type";s:3:"box";s:4:"span";s:3:"all";s:4:"name";s:18:"plugin_description";s:6:"needed";s:1:"1";s:4:"size";s:1:"1";i:1;a:7:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:6:"needed";s:1:"1";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:6:"needed";s:1:"1";s:5:"label";s:11:"Description";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:18:"plugin_description";}s:4:"name";s:11:"description";s:7:"no_lang";s:1:"1";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1158223021',);
+$templ_data[] = array('name' => 'importexport.export_dialog.general_tab_content','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"c2";s:14:"select_appname";s:2:"c3";s:17:"select_definition";s:2:"c4";s:13:"select_plugin";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Select application";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:7:"appname";s:8:"onchange";i:1;}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"Select definition";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:10:"definition";s:8:"onchange";i:1;}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Select plugin";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:8:"onchange";i:1;s:7:"no_lang";s:1:"1";s:4:"name";s:6:"plugin";}}i:5;a:2:{s:1:"A";a:6:{s:4:"type";s:3:"box";s:4:"span";s:3:"all";s:4:"name";s:18:"plugin_description";s:6:"needed";s:1:"1";s:4:"size";s:1:"1";i:1;a:7:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:6:"needed";s:1:"1";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:6:"needed";s:1:"1";s:5:"label";s:11:"Description";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:18:"plugin_description";}s:4:"name";s:11:"description";s:7:"no_lang";s:1:"1";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1158223021',);
 
 $templ_data[] = array('name' => 'importexport.export_dialog.options_tab','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:4:",top";s:2:"h1";s:25:",@plugin_options_template";}i:1;a:1:{s:1:"A";a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:19:"plugin_options_html";s:4:"type";s:4:"html";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:24:"@plugin_options_template";}}}s:4:"cols";i:1;s:4:"rows";i:2;s:4:"size";s:6:",200px";}}','size' => ',200px','style' => '','modified' => '1286482130',);
 
diff --git a/importexport/templates/default/export_dialog.xet b/importexport/templates/default/export_dialog.xet
index 326c6f4ea4..94e6732024 100644
--- a/importexport/templates/default/export_dialog.xet
+++ b/importexport/templates/default/export_dialog.xet
@@ -2,37 +2,43 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="importexport.export_dialog.general_tab_content" template="" lang="" group="0" version="">
-		<grid height="200px">
+		<grid>
 			<columns>
 				<column/>
 				<column/>
 			</columns>
 			<rows>
 				<row>
-					<description span="all" value="some nice text"/>
+					<description span="all"/>
 				</row>
 				<row class="select_appname">
 					<description value="Select application"/>
 					<menulist>
-						<menupopup no_lang="1" id="appname" onchange="xajax_doXMLHTTP('importexport.uiexport.ajax_get_plugins',this.value);"/>
+						<menupopup no_lang="1" id="appname" onchange="1"/>
+					</menulist>
+				</row>
+				<row class="select_definition">
+					<description value="Select definition"/>
+					<menulist>
+						<menupopup no_lang="1" id="definition" onchange="1"/>
 					</menulist>
 				</row>
 				<row class="select_plugin">
-					<description value="Select format"/>
+					<description value="Select plugin"/>
 					<menulist>
-						<menupopup no_lang="1" id="plugin" onchange="xajax_doXMLHTTP('importexport.uiexport.ajax_get_plugin_options',this.value);"/>
+						<menupopup onchange="1" no_lang="1" id="plugin"/>
 					</menulist>
 				</row>
 				<row>
 					<box span="all" id="plugin_description" needed="1">
-						<description span="all" needed="1" id="plugin_description" no_lang="1"/>
+						<description span="all" needed="1" id="description" no_lang="1"/>
 					</box>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="importexport.export_dialog.general_tab" template="" lang="" group="0" version="">
-		<grid>
+		<grid height="200px">
 			<columns>
 				<column/>
 				<column/>
@@ -51,9 +57,12 @@
 				<column/>
 			</columns>
 			<rows>
-				<row valign="top">
+				<row valign="top" disabled="@plugin_selectors_template">
 					<html id="plugin_selectors_html" no_lang="1"/>
 				</row>
+				<row>
+					<template id="@plugin_selectors_template"/>
+				</row>
 			</rows>
 		</grid>
 	</template>
@@ -63,37 +72,16 @@
 				<column/>
 			</columns>
 			<rows>
-				<row valign="top">
-					<html id="plugin_options_html" no_lang="1"/>
+				<row valign="top" disabled="@plugin_options_template">
+					<html no_lang="1" id="plugin_options_html"/>
+				</row>
+				<row>
+					<template id="@plugin_options_template"/>
 				</row>
 			</rows>
 		</grid>
 	</template>
-	<template id="importexport.export_dialog.templates_tab" template="" lang="" group="0" version="">
-		<grid>
-			<columns>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<description value="Select a template"/>
-				</row>
-				<row>
-					<listbox no_lang="1" id="templates" rows="5"/>
-				</row>
-				<row>
-					<description value="Description"/>
-				</row>
-				<row>
-					<description id="description"/>
-				</row>
-				<row>
-					<button label="Load" id="load"/>
-				</row>
-			</rows>
-		</grid>
-	</template>
-	<template id="importexport.export_dialog" template="" lang="" group="0" version="">
+	<template id="importexport.export_dialog" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
 			<columns>
 				<column/>
@@ -103,23 +91,21 @@
 					<description id="msg"/>
 				</row>
 				<row>
-					<tabbox>
+					<tabbox id="general_tab|selection_tab|options_tab">
 						<tabs>
 							<tab label="General" statustext=""/>
 							<tab label="Selection" statustext=""/>
 							<tab label="Options" statustext=""/>
-							<tab label="Templates" statustext=""/>
 						</tabs>
 						<tabpanels>
 							<template id="importexport.export_dialog.general_tab"/>
 							<template id="importexport.export_dialog.selection_tab"/>
 							<template id="importexport.export_dialog.options_tab"/>
-							<template id="importexport.export_dialog.templates_tab"/>
 						</tabpanels>
 					</tabbox>
 				</row>
-				<row>
-					<checkbox label="Save as template" id="save_as_template"/>
+				<row class="save_definition">
+					<checkbox label="Save as definition" id="save_as_definition"/>
 				</row>
 				<row>
 					<hbox span="all">
@@ -137,32 +123,32 @@
 				</row>
 				<row>
 					<box class="preview-box-buttons" id="preview-box-buttons" needed="1" align="center">
-						<button label="OK" align="center" onclick="document.getElementById('divPoweredBy').style.display='block'; document.getElementById(form::name('preview-box')).style.display='none'; document.getElementById(form::name('preview-box-buttons')).style.display='none'; return false;"/>
+						<button label="OK" align="center" onclick="document.getElementById(form::name('preview-box')).style.display='none'; document.getElementById(form::name('preview-box-buttons')).style.display='none'; return false;"/>
 					</box>
 				</row>
 			</rows>
 		</grid>
 		<styles>
-			.preview-box {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  width: 400px;
-  height: 360px;
-  overflow: scroll;
-  background-color: white;
-  z-index: 999;
-  display: none;
-}
-.preview-box-buttons {
-  position: absolute;
-  top: 365px;
-  left: 0px;
-  width: 400px;
-  height: 20px;
-
-  z-index: 999;
-  display: none;
+			.preview-box {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  width: 400px;
+  height: 360px;
+  overflow: scroll;
+  background-color: white;
+  z-index: 999;
+  display: none;
+}
+.preview-box-buttons {
+  position: absolute;
+  top: 365px;
+  left: 0px;
+  width: 400px;
+  height: 20px;
+
+  z-index: 999;
+  display: none;
 }
 		</styles>
 	</template>