diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 87427e4..f5086ad 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e7c9c2bb-66f1-4e37-904c-d33d8c113bde" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/css/calendarimporter-main.css" afterPath="$PROJECT_DIR$/resources/css/calendarimporter-main.css" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/data/Actions.js" afterPath="$PROJECT_DIR$/js/data/Actions.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/plugin.calendarimporter.js" afterPath="$PROJECT_DIR$/js/plugin.calendarimporter.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/ui/ContextMenu.js" afterPath="$PROJECT_DIR$/js/ui/ContextMenu.js" />
     </list>
     <ignored path="calendarimporter.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -23,23 +25,44 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="helper.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/php/helper.php">
+      <file leaf-file-name="plugin.calendarimporter.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/js/plugin.calendarimporter.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="690">
-              <caret line="56" column="41" selection-start-line="56" selection-start-column="41" selection-end-line="56" selection-end-column="41" />
+            <state relative-caret-position="300">
+              <caret line="97" column="8" selection-start-line="97" selection-start-column="8" selection-end-line="97" selection-end-column="124" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ContextMenu.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/js/ui/ContextMenu.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="534">
+              <caret line="96" column="123" selection-start-line="96" selection-start-column="123" selection-end-line="96" selection-end-column="123" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="module.calendar.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/php/module.calendar.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="234">
+              <caret line="216" column="38" selection-start-line="216" selection-start-column="31" selection-end-line="216" selection-end-column="38" />
               <folding>
-                <element signature="e#6#905#0#PHP" expanded="true" />
+                <element signature="e#6#914#0#PHP" expanded="true" />
+                <element signature="e#1004#1022#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="calendarimporter-main.css" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/resources/css/calendarimporter-main.css">
+      <file leaf-file-name="Actions.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/js/data/Actions.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="1" column="56" selection-start-line="1" selection-start-column="56" selection-end-line="1" selection-end-column="56" />
+            <state relative-caret-position="369">
+              <caret line="52" column="92" selection-start-line="52" selection-start-column="92" selection-end-line="52" selection-end-column="92" />
               <folding />
             </state>
           </provider>
@@ -69,7 +92,6 @@
         <option value="$PROJECT_DIR$/php/plugin.calendarimporter.php" />
         <option value="$PROJECT_DIR$/build.xml" />
         <option value="$PROJECT_DIR$/js/ABOUT.js" />
-        <option value="$PROJECT_DIR$/js/ui/ContextMenu.js" />
         <option value="$PROJECT_DIR$/js/settings/SettingsWidget.js" />
         <option value="$PROJECT_DIR$/js/settings/SettingsCalSyncWidget.js" />
         <option value="$PROJECT_DIR$/js/settings/ui/CalSyncGrid.js" />
@@ -79,17 +101,18 @@
         <option value="$PROJECT_DIR$/js/dialogs/ImportPanel.js" />
         <option value="$PROJECT_DIR$/js/dialogs/ImportContentPanel.js" />
         <option value="$PROJECT_DIR$/js/data/ResponseHandler.js" />
-        <option value="$PROJECT_DIR$/js/data/Actions.js" />
         <option value="$PROJECT_DIR$/js/data/timezones.js" />
         <option value="$PROJECT_DIR$/backend/.htaccess" />
         <option value="$PROJECT_DIR$/config.php" />
-        <option value="$PROJECT_DIR$/js/plugin.calendarimporter.js" />
         <option value="$PROJECT_DIR$/php/Helper.php" />
         <option value="$PROJECT_DIR$/php/helper.php" />
         <option value="$PROJECT_DIR$/php/download.php" />
         <option value="$PROJECT_DIR$/php/upload.php" />
         <option value="$PROJECT_DIR$/php/module.calendar.php" />
         <option value="$PROJECT_DIR$/resources/css/calendarimporter-main.css" />
+        <option value="$PROJECT_DIR$/js/plugin.calendarimporter.js" />
+        <option value="$PROJECT_DIR$/js/ui/ContextMenu.js" />
+        <option value="$PROJECT_DIR$/js/data/Actions.js" />
       </list>
     </option>
   </component>
@@ -213,6 +236,42 @@
               <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="calendarimporter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="calendarimporter" />
+              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="js" />
+              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ui" />
+              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="calendarimporter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="calendarimporter" />
+              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="js" />
+              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="data" />
+              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
       <pane id="Scope" />
@@ -285,12 +344,12 @@
       <option name="presentableId" value="Default" />
       <updated>1477949602474</updated>
       <workItem from="1477949603566" duration="9204000" />
-      <workItem from="1480441197414" duration="9140000" />
+      <workItem from="1480441197414" duration="10980000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="18344000" />
+    <option name="totallyTimeSpent" value="20184000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="65" y="24" width="1792" height="999" extended-state="6" />
@@ -362,7 +421,7 @@
         <state relative-caret-position="60">
           <caret line="24" column="47" selection-start-line="24" selection-start-column="47" selection-end-line="24" selection-end-column="47" />
           <folding>
-            <element signature="e#21#926#0#PHP" expanded="true" />
+            <element signature="e#21#926#0#PHP" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -444,7 +503,7 @@
         <state relative-caret-position="60">
           <caret line="24" column="47" selection-start-line="24" selection-start-column="47" selection-end-line="24" selection-end-column="47" />
           <folding>
-            <element signature="e#21#926#0#PHP" expanded="true" />
+            <element signature="e#21#926#0#PHP" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -607,30 +666,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/ui/ContextMenu.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="504">
-          <caret line="101" column="8" selection-start-line="101" selection-start-column="8" selection-end-line="104" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/data/Actions.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1191">
-          <caret line="45" column="63" selection-start-line="45" selection-start-column="63" selection-end-line="45" selection-end-column="63" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/plugin.calendarimporter.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="729">
-          <caret line="320" column="54" selection-start-line="320" selection-start-column="31" selection-end-line="320" selection-end-column="54" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Makefile">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
@@ -673,14 +708,11 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/php/module.calendar.php">
+    <entry file="file://$PROJECT_DIR$/resources/css/calendarimporter-main.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#6#914#0#PHP" expanded="true" />
-            <element signature="e#1004#1022#0#PHP" expanded="true" />
-          </folding>
+        <state relative-caret-position="180">
+          <caret line="12" column="31" selection-start-line="12" selection-start-column="31" selection-end-line="12" selection-end-column="31" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -694,10 +726,37 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/resources/css/calendarimporter-main.css">
+    <entry file="file://$PROJECT_DIR$/js/plugin.calendarimporter.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="56" selection-start-line="1" selection-start-column="56" selection-end-line="1" selection-end-column="56" />
+        <state relative-caret-position="300">
+          <caret line="97" column="8" selection-start-line="97" selection-start-column="8" selection-end-line="97" selection-end-column="124" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/php/module.calendar.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="234">
+          <caret line="216" column="38" selection-start-line="216" selection-start-column="31" selection-end-line="216" selection-end-column="38" />
+          <folding>
+            <element signature="e#6#914#0#PHP" expanded="true" />
+            <element signature="e#1004#1022#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/ui/ContextMenu.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="534">
+          <caret line="96" column="123" selection-start-line="96" selection-start-column="123" selection-end-line="96" selection-end-column="123" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/data/Actions.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="369">
+          <caret line="52" column="92" selection-start-line="52" selection-start-column="92" selection-end-line="52" selection-end-column="92" />
           <folding />
         </state>
       </provider>
diff --git a/js/data/Actions.js b/js/data/Actions.js
index f52f6d2..da1c61d 100644
--- a/js/data/Actions.js
+++ b/js/data/Actions.js
@@ -34,6 +34,59 @@ Ext.namespace('Zarafa.plugins.calendarimporter.data');
  * @singleton
  */
 Zarafa.plugins.calendarimporter.data.Actions = {
+    /**
+     * Generates a request to download the selected records as vCard.
+     *
+     * @param storeId
+     * @param recordIds
+     */
+    exportToICS: function (storeId, recordIds, recordFolder) {
+        if((typeof recordIds != "undefined" && recordIds.length < 1) || (typeof recordFolder != "undefined" && recordFolder.get('content_count') < 1)) {
+            Zarafa.common.dialogs.MessageBox.show({
+                title: dgettext('plugin_calendarimporter', 'Error'),
+                msg: dgettext('plugin_calendarimporter', 'No events found. Export skipped!'),
+                icon: Zarafa.common.dialogs.MessageBox.ERROR,
+                buttons: Zarafa.common.dialogs.MessageBox.OK
+            });
+        } else {
+
+            var responseHandler = new Zarafa.plugins.calendarimporter.data.ResponseHandler({
+                successCallback: Zarafa.plugins.calendarimporter.data.Actions.downloadICS
+            });
+
+            var recordcount = 0;
+            var exportPayload = {
+                storeid: storeId,
+                records: undefined,
+                folder: undefined
+            };
+
+            if(typeof recordIds != "undefined") {
+                exportPayload.records = recordIds;
+                recordcount = recordIds.length;
+            }
+
+            if(typeof recordFolder != "undefined") {
+                exportPayload.folder = recordFolder.get("entryid");
+                recordcount = recordFolder.get('content_count');
+            }
+
+            // Notify user
+            // # TRANSLATORS: {0} will be replaced by the number of contacts that will be exported
+            container.getNotifier().notify('info', dgettext('plugin_contactimporter', 'Calendar Export'), String.format(dgettext('plugin_calendarimporter', 'Exporting {0} events. Please wait...'), recordcount));
+
+
+
+            // request attachment preperation
+            container.getRequest().singleRequest(
+                'calendarmodule',
+                'export',
+                exportPayload,
+                responseHandler
+            );
+        }
+    },
+
     /**
      * Callback for the export request.
      * @param {Object} response
diff --git a/js/plugin.calendarimporter.js b/js/plugin.calendarimporter.js
index 2e751ae..a5838f1 100644
--- a/js/plugin.calendarimporter.js
+++ b/js/plugin.calendarimporter.js
@@ -95,26 +95,7 @@ Zarafa.plugins.calendarimporter.ImportPlugin = Ext.extend(Zarafa.core.Plugin, {
             recordIds.push(btn.records[i].get("entryid"));
         }
 
-        var responseHandler = new Zarafa.plugins.calendarimporter.data.ResponseHandler({
-            successCallback: Zarafa.plugins.calendarimporter.data.Actions.downloadICS,
-            scope: this
-        });
-
-        // Notify user
-        // # TRANSLATORS: {0} will be replaced by the number of contacts that will be exported
-        container.getNotifier().notify('info', dgettext('plugin_contactimporter', 'Calendar Export'), String.format(dgettext('plugin_calendarimporter', 'Exporting {0} events. Please wait...'), recordIds.length));
-
-
-        // request attachment preperation
-        container.getRequest().singleRequest(
-            'calendarmodule',
-            'export',
-            {
-                storeid: btn.records[0].get("store_entryid"),
-                records: recordIds
-            },
-            responseHandler
-        );
+        Zarafa.plugins.calendarimporter.data.Actions.exportToICS(btn.records[0].get("store_entryid"), recordIds, undefined);
     },
 
     /**
diff --git a/js/ui/ContextMenu.js b/js/ui/ContextMenu.js
index 3eb82da..d8bee7e 100644
--- a/js/ui/ContextMenu.js
+++ b/js/ui/ContextMenu.js
@@ -94,25 +94,7 @@ Zarafa.plugins.calendarimporter.ui.ContextMenu = Ext.extend(Zarafa.hierarchy.ui.
      * @private
      */
     onContextItemExport: function () {
-        var responseHandler = new Zarafa.plugins.calendarimporter.data.ResponseHandler({
-            successCallback: Zarafa.plugins.calendarimporter.data.Actions.downloadICS,
-            scope: this
-        });
-
-        // Notify user
-        // # TRANSLATORS: {0} will be replaced by the number of contacts that will be exported
-        container.getNotifier().notify('info', dgettext('plugin_contactimporter', 'Calendar Export'), String.format(dgettext('plugin_calendarimporter', 'Exporting {0} events. Please wait...'), this.records.get('content_count')));
-
-        // request attachment preperation
-        container.getRequest().singleRequest(
-            'calendarmodule',
-            'export',
-            {
-                storeid: this.records.get("store_entryid"),
-                folder: this.records.get("entryid")
-            },
-            responseHandler
-        );
+        Zarafa.plugins.calendarimporter.data.Actions.exportToICS(this.records.get("store_entryid"), undefined, this.records);
     },
 
     /**