diff --git a/config.php b/config.php
index 4cd6fbd..de30025 100644
--- a/config.php
+++ b/config.php
@@ -1,6 +1,8 @@
 <?php
 	/** Disable the import plugin for all clients */
 	define('PLUGIN_CALENDARIMPORTER_USER_DEFAULT_ENABLE', false);
+	/** Disable the export feature for all clients */
+	define('PLUGIN_CALENDARIMPORTER_USER_DEFAULT_ENABLE_EXPORT', false);
 	
 	/** The default calendar to import to*/
 	define('PLUGIN_CALENDARIMPORTER_DEFAULT', "Default");
diff --git a/js/data/ResponseHandler.js b/js/data/ResponseHandler.js
new file mode 100644
index 0000000..ed8e8be
--- /dev/null
+++ b/js/data/ResponseHandler.js
@@ -0,0 +1,36 @@
+Ext.namespace('Zarafa.plugins.calendarimporter.data');
+
+/**
+ * @class Zarafa.plugins.calendarimporter.data.ResponseHandler
+ * @extends Zarafa.plugins.calendarimporter.data.AbstractResponseHandler
+ *
+ * Export specific response handler.
+ */
+Zarafa.plugins.calendarimporter.data.ResponseHandler = Ext.extend(Zarafa.core.data.AbstractResponseHandler, {
+	/**
+	 * @cfg {Function} successCallback The function which
+	 * will be called after success request.
+	 */
+	successCallback : null,
+
+	/**
+	 * Call the successCallback callback function.
+	 * @param {Object} response Object contained the response data.
+	 */
+	doExport : function(response)
+	{
+		this.successCallback(response);
+	},
+	
+	/**
+	 * In case exception happened on server, server will return
+	 * exception response with the code of exception.
+	 * @param {Object} response Object contained the response data.
+	 */
+	doError: function(response)
+	{
+		alert("error response code: " + response.error.info.code);
+	}
+});
+
+Ext.reg('calendarimporter.calendarexporterresponsehandler', Zarafa.plugins.calendarimporter.data.ResponseHandler);
\ No newline at end of file
diff --git a/js/dialogs/ImportContentPanel.js b/js/dialogs/ImportContentPanel.js
index e4acc09..6a6d889 100644
--- a/js/dialogs/ImportContentPanel.js
+++ b/js/dialogs/ImportContentPanel.js
@@ -16,10 +16,15 @@ Zarafa.plugins.calendarimporter.dialogs.ImportContentPanel = Ext.extend(Zarafa.c
 	constructor : function(config)
 	{
 		config = config || {};
+		
+		var title = _('Import Calendar File');
+		if(container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/enable_export")){
+			title = _('Import/Export Calendar File');
+		}
 
 		Ext.applyIf(config, {
 			layout					: 'fit',
-			title					: _('Import Calendar File'),
+			title					: title,
 			closeOnSave				: true,
 			width					: 400,
 			height					: 300,
diff --git a/js/dialogs/ImportPanel.js b/js/dialogs/ImportPanel.js
index e2190fe..bb55107 100644
--- a/js/dialogs/ImportPanel.js
+++ b/js/dialogs/ImportPanel.js
@@ -13,7 +13,7 @@ Zarafa.plugins.calendarimporter.dialogs.ImportPanel = Ext.extend(Ext.form.FormPa
 	 * @constructor
 	 * @param {object} config
 	 */
-	constructor : function(config)
+	constructor : function (config) 
 	{
 		config = config || {};
 		var self = this;
@@ -34,6 +34,7 @@ Zarafa.plugins.calendarimporter.dialogs.ImportPanel = Ext.extend(Ext.form.FormPa
 				this.initForm()
 			],
 			buttons: [
+				this.createExportAllButton(),
 				this.createSubmitAllButton(),
 				this.createSubmitButton(),
 				this.createCancelButton()
@@ -48,7 +49,7 @@ Zarafa.plugins.calendarimporter.dialogs.ImportPanel = Ext.extend(Ext.form.FormPa
 	 * posted and contains the attachments
 	 * @private
 	 */
-	initForm : function()
+	initForm : function ()
 	{
 		return {
 			xtype: 'form',
@@ -75,10 +76,8 @@ Zarafa.plugins.calendarimporter.dialogs.ImportPanel = Ext.extend(Ext.form.FormPa
 	 */
 	createGrid : function(eventdata) {
 
-		if(eventdata == null) {
-			var parsedData = [
-			];
-		} else {
+		var parsedData = [];
+		if(eventdata !== null) {
 			var parsedData = new Array(eventdata.events.length);
 			
 			for(var i=0; i < eventdata.events.length; i++) {
@@ -231,6 +230,22 @@ Zarafa.plugins.calendarimporter.dialogs.ImportPanel = Ext.extend(Ext.form.FormPa
 		}
 	},
 	
+	createExportAllButton: function() {
+		return {
+			xtype: "button",
+			ref: "exportAllButton",
+			id: "exportAllButton",
+			hidden: !container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/enable_export"),
+			width: 100,
+			border: false,
+			text: _("Export All"),
+			anchor: "100%",
+			handler: this.exportAllEvents,
+			scope: this,
+			allowBlank: false
+		}
+	},
+	
 	createCancelButton: function() {
 		return {
 			xtype: "button",
@@ -345,6 +360,68 @@ Zarafa.plugins.calendarimporter.dialogs.ImportPanel = Ext.extend(Ext.form.FormPa
 			this.dialog.close();
 		}
     },
+	
+	exportAllEvents: function () {
+		//receive existing calendar store
+		var selIndex = this.calendarselector.selectedIndex;
+		var calValue = this.calendarselector.value;
+
+		if(selIndex == -1 || calValue == "") { // no calendar choosen
+			Ext.MessageBox.show({
+				title   : _('Error'),
+				msg     : _('You have to choose a calendar!'),
+				icon    : Ext.MessageBox.ERROR,
+				buttons : Ext.MessageBox.OK
+			});
+		} else {
+			
+			var calendarFolder =  container.getHierarchyStore().getDefaultFolder('calendar');
+			if(calValue != "calendar") {
+				var subFolders = calendarFolder.getChildren();
+
+				for(i=0;i<subFolders.length;i++) {
+					// loo up right folder 
+					// TODO: improve!!
+					if(subFolders[i].getDisplayName() == calValue) {
+						calendarFolder = subFolders[i];
+						break;
+					}
+				}
+			}
+		
+			// call export function here!
+			var responseHandler = new Zarafa.plugins.calendarimporter.data.ResponseHandler({
+				successCallback: this.exportDone.createDelegate(this)
+			});
+			
+			container.getRequest().singleRequest(
+				'calendarexportermodule',
+				'export',
+				{
+					calFolder : calValue,
+					calIndex : selIndex,
+					store_entryid : calendarFolder.data.store_entryid,
+					entryid : calendarFolder.data.entryid
+				},
+				responseHandler
+			);
+		}
+    },
+	
+	/**
+	 * Export done =)
+	 * @param {Object} response
+	 * @private
+	 */
+	exportDone : function(response)
+	{
+		if(response.status === true) {
+			container.getNotifier().notify('info', 'Exported', 'Exported ' + response.entries + ' entries');
+		} else {
+			container.getNotifier().notify('error', 'Export Failed', 'Failed to export your calendar');
+		}
+		this.dialog.close();
+	},	
 
 	importCheckedEvents: function () {
 		//receive existing calendar store
diff --git a/js/plugin.calendarimporter.js b/js/plugin.calendarimporter.js
index 11aac83..a7b8199 100644
--- a/js/plugin.calendarimporter.js
+++ b/js/plugin.calendarimporter.js
@@ -1,6 +1,7 @@
 Ext.namespace("Zarafa.plugins.calendarimporter");    								// Assign the right namespace
 
 Zarafa.plugins.calendarimporter.ImportPlugin = Ext.extend(Zarafa.core.Plugin, {      // create new import plugin
+
     /**
      * @constructor
      * @param {Object} config Configuration object
@@ -9,9 +10,7 @@ Zarafa.plugins.calendarimporter.ImportPlugin = Ext.extend(Zarafa.core.Plugin, {
 	constructor: function (config) {
 		config = config || {};
 		
-		Zarafa.plugins.calendarimporter.ImportPlugin.superclass.constructor.call(this, config);
-		
-		
+		Zarafa.plugins.calendarimporter.ImportPlugin.superclass.constructor.call(this, config);		
 	},
 	
 	/**
@@ -41,7 +40,12 @@ Zarafa.plugins.calendarimporter.ImportPlugin = Ext.extend(Zarafa.core.Plugin, {
 			navigationContext	: container.getContextByName('calendar'),
 			handler				: this.onImportButtonClick,
 			scope				: this
+		};
+		
+		if(container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/enable_export")) {
+			button.text = _('Import/Export Calendar');
 		}
+		
 		return  button;
 	},
 	
@@ -101,6 +105,6 @@ Zarafa.plugins.calendarimporter.ImportPlugin = Ext.extend(Zarafa.core.Plugin, {
  *############################################################################################################################*/
 Zarafa.onReady(function() {
 	if(container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/enable") === true) {
-		container.registerPlugin(new Zarafa.plugins.calendarimporter.ImportPlugin)
+		container.registerPlugin(new Zarafa.plugins.calendarimporter.ImportPlugin);
 	}
 });
diff --git a/manifest.xml b/manifest.xml
index 4ccee01..5f01d4c 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE plugin SYSTEM "manifest.dtd">
 <plugin version="2">
         <info>
-                <version>1.0</version>
+                <version>1.1</version>
                 <name>calendarimporter</name>
-                <title>ICS Calendar Importer</title>
+                <title>ICS Calendar Importer/Exporter</title>
                 <author>Christoph Haas</author>
                 <authorURL>http://www.sprinternet.at</authorURL>
                 <description>Import a ICS file to the zarafa calendar</description>
@@ -17,19 +17,21 @@
                         <files>
                                 <server>
                                         <serverfile>php/plugin.calendarimporter.php</serverfile>
+										<serverfile type="module" module="calendarexportermodule">php/module.calendarexporter.php</serverfile>
                                 </server>
                                 <client>
                                         <clientfile load="release">js/plugin.calendarimporter.js</clientfile>
+										<clientfile load="release">js/data/ResponseHandler.js</clientfile>
 										<clientfile load="release">js/dialogs/ImportContentPanel.js</clientfile>
 										<clientfile load="release">js/dialogs/ImportPanel.js</clientfile>
 										
                                         <clientfile load="debug">js/plugin.calendarimporter.js</clientfile>
+										<clientfile load="debug">js/data/ResponseHandler.js</clientfile>
 										<clientfile load="debug">js/dialogs/ImportContentPanel.js</clientfile>
 										<clientfile load="debug">js/dialogs/ImportPanel.js</clientfile>
                                 </client>
                                 <resources>
-                                        <resourcefile load="release">resources/css/calendarimporter.css</resourcefile>
-										
+                                        <resourcefile load="release">resources/css/calendarimporter.css</resourcefile>										
 										<resourcefile load="debug">resources/css/calendarimporter.css</resourcefile>
                                 </resources>
                         </files>
diff --git a/php/module.calendarexporter.php b/php/module.calendarexporter.php
new file mode 100644
index 0000000..04af4a7
--- /dev/null
+++ b/php/module.calendarexporter.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * class.calendarexporter.php, zarafa calender to ics exporter
+ *
+ * Author: Christoph Haas <christoph.h@sprinternet.at>
+ * Copyright (C) 2012 Christoph Haas
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+/**
+ * This module integrates Owncloud into attachment part of emails
+ * @class OwncloudModule
+ * @extends Module
+ */
+class CalendarexporterModule extends Module {
+
+	private $DEBUG = true; 	// enable error_log debugging
+
+	/**
+	 * @constructor
+	 * @param $id
+	 * @param $data
+	 */
+	public function __construct($id, $data) {
+			parent::Module($id, $data);	
+	}
+
+	/**
+	 * Executes all the actions in the $data variable.
+	 * Exception part is used for authentication errors also
+	 * @return boolean true on success or false on failure.
+	 */
+	public function execute() {
+		$result = false;
+
+		foreach($this->data as $actionType => $actionData) {	
+			if(isset($actionType)) {
+				try {
+					if($this->DEBUG) {
+						error_log("exec: " . $actionType);
+					}
+					switch($actionType) {
+						case "export":
+							$result = $this->exportCalendar($actionType, $actionData);
+							break;									
+						default:
+							$this->handleUnknownActionType($actionType);
+					}
+
+				} catch (MAPIException $e) {
+					if($this->DEBUG) {
+						error_log("mapi exception: " . $e->getMessage());
+					}
+				} catch (Exception $e) {
+					if($this->DEBUG) {
+						error_log("exception: " . $e->getMessage());
+					}
+				}
+			}
+		}
+		
+		return $result;
+	}
+	
+	private function exportCalendar($actionType, $actionData) {
+		/* look up functionality in class.appointmentlistmodule.php (webapp/server/modules)*/
+	
+		$response['status']	=	true;
+		$response['entries'] =	"1002";	// number of entries that will be exported
+		$this->addActionData($actionType, $response);
+		$GLOBALS["bus"]->addData($this->getResponseData());
+		
+		if($this->DEBUG) {
+			error_log("export done, bus data written!");
+		}
+		
+	}
+};
+
+?>
diff --git a/php/plugin.calendarimporter.php b/php/plugin.calendarimporter.php
index f9b2b18..6dd4c37 100644
--- a/php/plugin.calendarimporter.php
+++ b/php/plugin.calendarimporter.php
@@ -47,7 +47,8 @@ class Plugincalendarimporter extends Plugin {
 					'plugins' => Array(
 						'calendarimporter' => Array(
 							'enable'        => PLUGIN_CALENDARIMPORTER_USER_DEFAULT_ENABLE,
-							'default_calendar'       => PLUGIN_CALENDARIMPORTER_DEFAULT	// currently not used, maybe in next release
+							'enable_export' => PLUGIN_CALENDARIMPORTER_USER_DEFAULT_ENABLE_EXPORT,
+							'default_calendar'	=> PLUGIN_CALENDARIMPORTER_DEFAULT	// currently not used, maybe in next release
 						)
 					)
 				)