diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0ef7566..cbf7262 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aae153d8-808f-4371-b0e9-9ee7ff904cab" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/contactimporter.iml" afterPath="$PROJECT_DIR$/.idea/contactimporter.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config.php" afterPath="$PROJECT_DIR$/config.php" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/manifest.xml" afterPath="$PROJECT_DIR$/manifest.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/php/download.php" afterPath="$PROJECT_DIR$/php/download.php" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/php/module.contact.php" afterPath="$PROJECT_DIR$/php/module.contact.php" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/php/plugin.contactimporter.php" afterPath="$PROJECT_DIR$/php/plugin.contactimporter.php" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/js/dialogs/fields.txt" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.mo" afterPath="$PROJECT_DIR$/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.mo" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/ABOUT.js" afterPath="$PROJECT_DIR$/js/ABOUT.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/data/ResponseHandler.js" afterPath="$PROJECT_DIR$/js/data/ResponseHandler.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/dialogs/ImportContentPanel.js" afterPath="$PROJECT_DIR$/js/dialogs/ImportContentPanel.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/dialogs/ImportPanel.js" afterPath="$PROJECT_DIR$/js/dialogs/ImportPanel.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/plugin.contactimporter.js" afterPath="$PROJECT_DIR$/js/plugin.contactimporter.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/ui/ContextMenu.js" afterPath="$PROJECT_DIR$/js/ui/ContextMenu.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.po" afterPath="$PROJECT_DIR$/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.po" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/php/upload.php" afterPath="$PROJECT_DIR$/php/upload.php" />
     </list>
     <ignored path="contactimporter.iws" />
@@ -28,7 +32,97 @@
     <favorites_list name="contactimporter" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="ImportPanel.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/js/dialogs/ImportPanel.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="15">
+              <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="59" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ResponseHandler.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/js/data/ResponseHandler.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1200">
+              <caret line="80" column="13" selection-start-line="80" selection-start-column="8" selection-end-line="80" selection-end-column="13" />
+              <folding>
+                <element signature="n#!!doc" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="download.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/php/download.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-225">
+              <caret line="3" column="15" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="57" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="module.contact.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/php/module.contact.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-16319">
+              <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
+              <folding>
+                <element signature="e#6#919#0#PHP" expanded="true" />
+                <element signature="e#959#992#0#PHP" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="plugin.contactimporter.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/php/plugin.contactimporter.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="675">
+              <caret line="84" column="83" selection-start-line="84" selection-start-column="83" selection-end-line="84" selection-end-column="83" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="upload.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/php/upload.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="780">
+              <caret line="72" column="1" selection-start-line="72" selection-start-column="1" selection-end-line="72" selection-end-column="1" />
+              <folding>
+                <element signature="e#6#911#0#PHP" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="plugin_calendarimporter.po" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.po">
+          <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 />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ImportContentPanel.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/js/dialogs/ImportContentPanel.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="474">
+              <caret line="44" column="20" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="55" />
+              <folding>
+                <element signature="n#!!doc" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -38,9 +132,15 @@
       <list>
         <option value="$PROJECT_DIR$/php/download.php" />
         <option value="$PROJECT_DIR$/php/module.contact.php" />
-        <option value="$PROJECT_DIR$/php/upload.php" />
         <option value="$PROJECT_DIR$/php/plugin.contactimporter.php" />
         <option value="$PROJECT_DIR$/config.php" />
+        <option value="$PROJECT_DIR$/js/plugin.contactimporter.js" />
+        <option value="$PROJECT_DIR$/js/ABOUT.js" />
+        <option value="$PROJECT_DIR$/js/ui/ContextMenu.js" />
+        <option value="$PROJECT_DIR$/js/dialogs/ImportContentPanel.js" />
+        <option value="$PROJECT_DIR$/js/dialogs/ImportPanel.js" />
+        <option value="$PROJECT_DIR$/js/data/ResponseHandler.js" />
+        <option value="$PROJECT_DIR$/php/upload.php" />
       </list>
     </option>
   </component>
@@ -115,7 +215,7 @@
               <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
+              <option name="myItemId" value="php" />
               <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
             </PATH_ELEMENT>
           </PATH>
@@ -129,11 +229,115 @@
               <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
+              <option name="myItemId" value="languages" />
               <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="css" />
+              <option name="myItemId" value="en_US.UTF-8" />
+              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="contactimporter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="contactimporter" />
+              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="languages" />
+              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="en_US.UTF-8" />
+              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="LC_MESSAGES" />
+              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="contactimporter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="contactimporter" />
+              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="languages" />
+              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="contactimporter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="contactimporter" />
+              <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>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="contactimporter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="contactimporter" />
+              <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="contactimporter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="contactimporter" />
+              <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="dialogs" />
+              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="contactimporter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="contactimporter" />
+              <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>
@@ -206,18 +410,18 @@
       <updated>1480428196914</updated>
       <workItem from="1480428199144" duration="44000" />
       <workItem from="1480428259775" duration="69000" />
-      <workItem from="1480428330068" duration="1107000" />
+      <workItem from="1480428330068" duration="2756000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1220000" />
+    <option name="totallyTimeSpent" value="2869000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="65" y="24" width="1792" height="999" extended-state="6" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -262,41 +466,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/php/module.contact.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
-          <folding>
-            <element signature="e#6#919#0#PHP" expanded="true" />
-            <element signature="e#959#992#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/php/upload.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-196">
-          <caret line="2" column="55" selection-start-line="2" selection-start-column="55" selection-end-line="2" selection-end-column="55" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/php/plugin.contactimporter.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="675">
-          <caret line="84" column="83" selection-start-line="84" selection-start-column="83" selection-end-line="84" selection-end-column="83" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/php/download.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="615">
-          <caret line="41" column="0" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/resources/css/contactimporter-main.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -313,6 +482,114 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/js/ABOUT.js">
+      <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="20" selection-end-column="3" />
+          <folding>
+            <marker date="1480430157843" expanded="true" signature="1216:1220" ph="&lt;" />
+            <marker date="1480430157843" expanded="true" signature="1246:1250" ph="&gt;" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/plugin.contactimporter.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="585">
+          <caret line="138" column="53" selection-start-line="138" selection-start-column="18" selection-end-line="138" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/dialogs/fields.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3900">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <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="660">
+          <caret line="65" column="53" selection-start-line="65" selection-start-column="18" selection-end-line="65" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/dialogs/ImportContentPanel.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="474">
+          <caret line="44" column="20" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="55" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/dialogs/ImportPanel.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="59" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/data/ResponseHandler.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1200">
+          <caret line="80" column="13" selection-start-line="80" selection-start-column="8" selection-end-line="80" selection-end-column="13" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/php/download.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-225">
+          <caret line="3" column="15" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="57" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/php/module.contact.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-16319">
+          <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
+          <folding>
+            <element signature="e#6#919#0#PHP" expanded="true" />
+            <element signature="e#959#992#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/php/plugin.contactimporter.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="675">
+          <caret line="84" column="83" selection-start-line="84" selection-start-column="83" selection-end-line="84" selection-end-column="83" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/php/upload.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="780">
+          <caret line="72" column="1" selection-start-line="72" selection-start-column="1" selection-end-line="72" selection-end-column="1" />
+          <folding>
+            <element signature="e#6#911#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.po">
+      <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 />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/js/ABOUT.js b/js/ABOUT.js
index 0ab467c..63519d2 100644
--- a/js/ABOUT.js
+++ b/js/ABOUT.js
@@ -1,5 +1,5 @@
 /**
- * ABOUT.js zarafa contact to vcf im/exporter
+ * ABOUT.js, Kopano Webapp contact to vcf im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
  * Copyright (C) 2012-2016 Christoph Haas
@@ -29,30 +29,30 @@ Ext.namespace('Zarafa.plugins.contactimporter');
  * The copyright string holding the copyright notice for the Zarafa contactimporter Plugin.
  */
 Zarafa.plugins.contactimporter.ABOUT = ""
-+ "<p>Copyright (C) 2012-2016  Christoph Haas &lt;christoph.h@sprinternet.at&gt;</p>"
+    + "<p>Copyright (C) 2012-2016  Christoph Haas &lt;christoph.h@sprinternet.at&gt;</p>"
 
-+ "<p>This program 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.</p>"
+    + "<p>This program 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.</p>"
 
-+ "<p>This program 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.</p>"
+    + "<p>This program 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.</p>"
 
-+ "<p>You should have received a copy of the GNU Lesser General Public "
-+ "License along with this program; if not, write to the Free Software "
-+ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</p>"
+    + "<p>You should have received a copy of the GNU Lesser General Public "
+    + "License along with this program; if not, write to the Free Software "
+    + "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</p>"
 
-+ "<hr />"
+    + "<hr />"
 
-+ "<p>The contactimporter plugin contains the following third-party components:</p>"
+    + "<p>The contactimporter plugin contains the following third-party components:</p>"
 
-+ "<h1>vCard-parser</h1>"
+    + "<h1>vCard-parser</h1>"
 
-+ "<p>Copyright (C) 2016 Jeroen Desloovere</p>"
+    + "<p>Copyright (C) 2016 Jeroen Desloovere</p>"
 
-+ "<p>Licensed under the MIT License.</p>"
+    + "<p>Licensed under the MIT License.</p>"
 
-+ "<p>Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</p>"
\ No newline at end of file
+    + "<p>Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</p>"
\ No newline at end of file
diff --git a/js/data/ResponseHandler.js b/js/data/ResponseHandler.js
index fdb5228..1a30bbf 100644
--- a/js/data/ResponseHandler.js
+++ b/js/data/ResponseHandler.js
@@ -1,5 +1,5 @@
 /**
- * ResponseHandler.js zarafa contact im/exporter
+ * ResponseHandler.js, Kopano Webapp contact to vcf im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
  * Copyright (C) 2012-2016 Christoph Haas
@@ -34,52 +34,52 @@ Ext.namespace('Zarafa.plugins.contactimporter.data');
  * Calendar specific response handler.
  */
 Zarafa.plugins.contactimporter.data.ResponseHandler = Ext.extend(Zarafa.core.data.AbstractResponseHandler, {
-	/**
-	 * @cfg {Function} successCallback The function which
-	 * will be called after success request.
-	 */
-	successCallback: null,
+    /**
+     * @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.
-	 */
-	doLoad: function (response) {
-		this.successCallback(response);
-	},
+    /**
+     * Call the successCallback callback function.
+     * @param {Object} response Object contained the response data.
+     */
+    doLoad: function (response) {
+        this.successCallback(response);
+    },
 
-	/**
-	 * Call the successCallback callback function.
-	 * @param {Object} response Object contained the response data.
-	 */
-	doImport: function (response) {
-		this.successCallback(response);
-	},
+    /**
+     * Call the successCallback callback function.
+     * @param {Object} response Object contained the response data.
+     */
+    doImport: function (response) {
+        this.successCallback(response);
+    },
 
-	/**
-	 * Call the successCallback callback function.
-	 * @param {Object} response Object contained the response data.
-	 */
-	doExport: function (response) {
-		this.successCallback(response);
-	},
+    /**
+     * Call the successCallback callback function.
+     * @param {Object} response Object contained the response data.
+     */
+    doExport: function (response) {
+        this.successCallback(response);
+    },
 
-	/**
-	 * Call the successCallback callback function.
-	 * @param {Object} response Object contained the response data.
-	 */
-	doImportattachment: function (response) {
-		this.successCallback(response);
-	},
+    /**
+     * Call the successCallback callback function.
+     * @param {Object} response Object contained the response data.
+     */
+    doImportattachment: 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);
-	}
+    /**
+     * 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('contactimporter.contactresponsehandler', Zarafa.plugins.contactimporter.data.ResponseHandler);
\ No newline at end of file
diff --git a/js/dialogs/ImportContentPanel.js b/js/dialogs/ImportContentPanel.js
index 1270c32..a6f6d2b 100644
--- a/js/dialogs/ImportContentPanel.js
+++ b/js/dialogs/ImportContentPanel.js
@@ -1,5 +1,5 @@
 /**
- * ImportContentPanel.js zarafa contact to vcf im/exporter
+ * ImportContentPanel.js, Kopano Webapp contact to vcf im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
  * Copyright (C) 2012-2016 Christoph Haas
@@ -36,31 +36,31 @@ Ext.namespace("Zarafa.plugins.contactimporter.dialogs");
  */
 Zarafa.plugins.contactimporter.dialogs.ImportContentPanel = Ext.extend(Zarafa.core.ui.ContentPanel, {
 
-	/**
-	 * @constructor
-	 * @param config Configuration structure
-	 */
-	constructor: function (config) {
-		config = config || {};
-		var title = _('Import Contacts');
-		Ext.applyIf(config, {
-			layout     : 'fit',
-			title      : title,
-			closeOnSave: true,
-			width      : 620,
-			height     : 465,
-			//Add panel
-			items      : [
-				{
-					xtype   : 'contactimporter.importcontactpanel',
-					filename: config.filename,
-					folder  : config.folder
-				}
-			]
-		});
+    /**
+     * @constructor
+     * @param config Configuration structure
+     */
+    constructor: function (config) {
+        config = config || {};
+        var title = dgettext('plugin_contactimporter', 'Import Contacts');
+        Ext.applyIf(config, {
+            layout: 'fit',
+            title: title,
+            closeOnSave: true,
+            width: 620,
+            height: 465,
+            //Add panel
+            items: [
+                {
+                    xtype: 'contactimporter.importcontactpanel',
+                    filename: config.filename,
+                    folder: config.folder
+                }
+            ]
+        });
 
-		Zarafa.plugins.contactimporter.dialogs.ImportContentPanel.superclass.constructor.call(this, config);
-	}
+        Zarafa.plugins.contactimporter.dialogs.ImportContentPanel.superclass.constructor.call(this, config);
+    }
 
 });
 
diff --git a/js/dialogs/ImportPanel.js b/js/dialogs/ImportPanel.js
index 43aeba9..68719eb 100644
--- a/js/dialogs/ImportPanel.js
+++ b/js/dialogs/ImportPanel.js
@@ -1,5 +1,5 @@
 /**
- * ImportPanel.js zarafa contact to vcf im/exporter
+ * ImportPanel.js, Kopano Webapp contact to vcf im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
  * Copyright (C) 2012-2016 Christoph Haas
@@ -33,562 +33,564 @@ Ext.namespace("Zarafa.plugins.contactimporter.dialogs");
  */
 Zarafa.plugins.contactimporter.dialogs.ImportPanel = Ext.extend(Ext.Panel, {
 
-	/* path to vcf file on server... */
-	vcffile: null,
+    /* path to vcf file on server... */
+    vcffile: null,
 
-	/* The store for the selection grid */
-	store  : null,
+    /* The store for the selection grid */
+    store: null,
 
-	/* selected folder */
-	folder : null,
+    /* selected folder */
+    folder: null,
 
-	/**
-	 * @constructor
-	 * @param {object} config
-	 */
-	constructor: function (config) {
-		config = config || {};
-		var self = this;
+    /**
+     * @constructor
+     * @param {object} config
+     */
+    constructor: function (config) {
+        config = config || {};
+        var self = this;
 
-		if (!Ext.isEmpty(config.filename)) {
-			this.vcffile = config.filename;
-		}
+        if (!Ext.isEmpty(config.filename)) {
+            this.vcffile = config.filename;
+        }
 
-		if (!Ext.isEmpty(config.folder)) {
-			this.folder = config.folder;
-		}
+        if (!Ext.isEmpty(config.folder)) {
+            this.folder = config.folder;
+        }
 
-		// create the data store
-		// we only display the firstname, lastname, homephone and primary email address in our grid
-		this.store = new Ext.data.ArrayStore({
-			fields: [
-				{name: 'display_name'},
-				{name: 'given_name'},
-				{name: 'surname'},
-				{name: 'company_name'},
-				{name: 'record'}
-			]
-		});
+        // create the data store
+        // we only display the firstname, lastname, homephone and primary email address in our grid
+        this.store = new Ext.data.ArrayStore({
+            fields: [
+                {name: 'display_name'},
+                {name: 'given_name'},
+                {name: 'surname'},
+                {name: 'company_name'},
+                {name: 'record'}
+            ]
+        });
 
-		Ext.apply(config, {
-			xtype    : 'contactimporter.importpanel',
-			ref      : "importcontactpanel",
-			layout   : {
-				type : 'form',
-				align: 'stretch'
-			},
-			anchor   : '100%',
-			bodyStyle: 'background-color: inherit;',
-			defaults : {
-				border   : true,
-				bodyStyle: 'background-color: inherit; padding: 3px 0px 3px 0px; border-style: none none solid none;'
-			},
-			items    : [
-				this.createSelectBox(),
-				this.initForm(),
-				this.createGrid()
-			],
-			buttons  : [
-				this.createSubmitAllButton(),
-				this.createSubmitButton(),
-				this.createCancelButton()
-			],
-			listeners: {
-				afterrender: function (cmp) {
-					this.loadMask = new Ext.LoadMask(this.getEl(), {msg: 'Loading...'});
+        Ext.apply(config, {
+            xtype: 'contactimporter.importpanel',
+            ref: "importcontactpanel",
+            layout: {
+                type: 'form',
+                align: 'stretch'
+            },
+            anchor: '100%',
+            bodyStyle: 'background-color: inherit;',
+            defaults: {
+                border: true,
+                bodyStyle: 'background-color: inherit; padding: 3px 0px 3px 0px; border-style: none none solid none;'
+            },
+            items: [
+                this.createSelectBox(),
+                this.initForm(),
+                this.createGrid()
+            ],
+            buttons: [
+                this.createSubmitAllButton(),
+                this.createSubmitButton(),
+                this.createCancelButton()
+            ],
+            listeners: {
+                afterrender: function (cmp) {
+                    this.loadMask = new Ext.LoadMask(this.getEl(), {msg: dgettext('plugin_contactimporter', 'Loading...')});
 
-					if (this.vcffile != null) { // if we have got the filename from an attachment
-						this.parseContacts(this.vcffile);
-					}
-				},
-				scope      : this
-			}
-		});
+                    if (this.vcffile != null) { // if we have got the filename from an attachment
+                        this.parseContacts(this.vcffile);
+                    }
+                },
+                scope: this
+            }
+        });
 
-		Zarafa.plugins.contactimporter.dialogs.ImportPanel.superclass.constructor.call(this, config);
-	},
+        Zarafa.plugins.contactimporter.dialogs.ImportPanel.superclass.constructor.call(this, config);
+    },
 
-	/**
-	 * Init embedded form, this is the form that is
-	 * posted and contains the attachments
-	 * @private
-	 */
-	initForm: function () {
-		return {
-			xtype     : 'form',
-			ref       : 'addContactFormPanel',
-			layout    : 'column',
-			fileUpload: true,
-			autoWidth : true,
-			autoHeight: true,
-			border    : false,
-			bodyStyle : 'padding: 5px;',
-			defaults  : {
-				anchor   : '95%',
-				border   : false,
-				bodyStyle: 'padding: 5px;'
-			},
-			items     : [this.createUploadField()]
-		};
-	},
+    /**
+     * Init embedded form, this is the form that is
+     * posted and contains the attachments
+     * @private
+     */
+    initForm: function () {
+        return {
+            xtype: 'form',
+            ref: 'addContactFormPanel',
+            layout: 'column',
+            fileUpload: true,
+            autoWidth: true,
+            autoHeight: true,
+            border: false,
+            bodyStyle: 'padding: 5px;',
+            defaults: {
+                anchor: '95%',
+                border: false,
+                bodyStyle: 'padding: 5px;'
+            },
+            items: [this.createUploadField()]
+        };
+    },
 
-	/**
-	 * Get all contact folders.
-	 * @param {boolean} asDropdownStore If true, a simple array store will be returned.
-	 * @returns {*}
-	 */
-	getAllContactFolders: function (asDropdownStore) {
-		asDropdownStore = Ext.isEmpty(asDropdownStore) ? false : asDropdownStore;
+    /**
+     * Get all contact folders.
+     * @param {boolean} asDropdownStore If true, a simple array store will be returned.
+     * @returns {*}
+     */
+    getAllContactFolders: function (asDropdownStore) {
+        asDropdownStore = Ext.isEmpty(asDropdownStore) ? false : asDropdownStore;
 
-		var allFolders = [];
+        var allFolders = [];
 
-		var defaultContactFolder = container.getHierarchyStore().getDefaultFolder('contact');
+        var defaultContactFolder = container.getHierarchyStore().getDefaultFolder('contact');
 
-		var inbox = container.getHierarchyStore().getDefaultStore();
-		var pub = container.getHierarchyStore().getPublicStore();
+        var inbox = container.getHierarchyStore().getDefaultStore();
+        var pub = container.getHierarchyStore().getPublicStore();
 
-		if (!Ext.isEmpty(inbox.subStores) && inbox.subStores.folders.totalLength > 0) {
-			for (var i = 0; i < inbox.subStores.folders.totalLength; i++) {
-				var folder = inbox.subStores.folders.getAt(i);
-				if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Contact") {
-					if (asDropdownStore) {
-						allFolders.push([
-							folder.get("entryid"),
-							folder.get("display_name")
-						]);
-					} else {
-						allFolders.push({
-							display_name : folder.get("display_name"),
-							entryid      : folder.get("entryid"),
-							store_entryid: folder.get("store_entryid"),
-							is_public    : false
-						});
-					}
-				}
-			}
-		}
+        if (!Ext.isEmpty(inbox.subStores) && inbox.subStores.folders.totalLength > 0) {
+            for (var i = 0; i < inbox.subStores.folders.totalLength; i++) {
+                var folder = inbox.subStores.folders.getAt(i);
+                if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Contact") {
+                    if (asDropdownStore) {
+                        allFolders.push([
+                            folder.get("entryid"),
+                            folder.get("display_name")
+                        ]);
+                    } else {
+                        allFolders.push({
+                            display_name: folder.get("display_name"),
+                            entryid: folder.get("entryid"),
+                            store_entryid: folder.get("store_entryid"),
+                            is_public: false
+                        });
+                    }
+                }
+            }
+        }
 
-		if (!Ext.isEmpty(pub.subStores) && pub.subStores.folders.totalLength > 0) {
-			for (var j = 0; j < pub.subStores.folders.totalLength; j++) {
-				var folder = pub.subStores.folders.getAt(j);
-				if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Contact") {
-					if (asDropdownStore) {
-						allFolders.push([
-							folder.get("entryid"),
-							folder.get("display_name") + " (Public)"
-						]);
-					} else {
-						allFolders.push({
-							display_name : folder.get("display_name"),
-							entryid      : folder.get("entryid"),
-							store_entryid: folder.get("store_entryid"),
-							is_public    : true
-						});
-					}
-				}
-			}
-		}
+        if (!Ext.isEmpty(pub.subStores) && pub.subStores.folders.totalLength > 0) {
+            for (var j = 0; j < pub.subStores.folders.totalLength; j++) {
+                var folder = pub.subStores.folders.getAt(j);
+                if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Contact") {
+                    if (asDropdownStore) {
+                        allFolders.push([
+                            folder.get("entryid"),
+                            folder.get("display_name") + " (Public)"
+                        ]);
+                    } else {
+                        allFolders.push({
+                            display_name: folder.get("display_name"),
+                            entryid: folder.get("entryid"),
+                            store_entryid: folder.get("store_entryid"),
+                            is_public: true
+                        });
+                    }
+                }
+            }
+        }
 
-		if (asDropdownStore) {
-			return allFolders.sort(this.dynamicSort(1));
-		} else {
-			return allFolders;
-		}
-	},
+        if (asDropdownStore) {
+            return allFolders.sort(this.dynamicSort(1));
+        } else {
+            return allFolders;
+        }
+    },
 
-	/**
-	 * Dynamic sort function, sorts by property name.
-	 * @param {string|int} property
-	 * @returns {Function}
-	 */
-	dynamicSort: function (property) {
-		var sortOrder = 1;
-		if (property[0] === "-") {
-			sortOrder = -1;
-			property = property.substr(1);
-		}
-		return function (a, b) {
-			var result = (a[property].toLowerCase() < b[property].toLowerCase()) ? -1 : (a[property].toLowerCase() > b[property].toLowerCase()) ? 1 : 0;
-			return result * sortOrder;
-		}
-	},
+    /**
+     * Dynamic sort function, sorts by property name.
+     * @param {string|int} property
+     * @returns {Function}
+     */
+    dynamicSort: function (property) {
+        var sortOrder = 1;
+        if (property[0] === "-") {
+            sortOrder = -1;
+            property = property.substr(1);
+        }
+        return function (a, b) {
+            var result = (a[property].toLowerCase() < b[property].toLowerCase()) ? -1 : (a[property].toLowerCase() > b[property].toLowerCase()) ? 1 : 0;
+            return result * sortOrder;
+        }
+    },
 
-	/**
-	 * Return a contact folder element by name.
-	 * @param {string} name
-	 * @returns {*}
-	 */
-	getContactFolderByName: function (name) {
-		var folders = this.getAllContactFolders(false);
+    /**
+     * Return a contact folder element by name.
+     * @param {string} name
+     * @returns {*}
+     */
+    getContactFolderByName: function (name) {
+        var folders = this.getAllContactFolders(false);
 
-		for (var i = 0; i < folders.length; i++) {
-			if (folders[i].display_name == name) {
-				return folders[i];
-			}
-		}
+        for (var i = 0; i < folders.length; i++) {
+            if (folders[i].display_name == name) {
+                return folders[i];
+            }
+        }
 
-		return container.getHierarchyStore().getDefaultFolder('contact');
-	},
+        return container.getHierarchyStore().getDefaultFolder('contact');
+    },
 
-	/**
-	 * Return a contact folder element by entryid.
-	 * @param {string} entryid
-	 * @returns {*}
-	 */
-	getContactFolderByEntryid: function (entryid) {
-		var folders = this.getAllContactFolders(false);
+    /**
+     * Return a contact folder element by entryid.
+     * @param {string} entryid
+     * @returns {*}
+     */
+    getContactFolderByEntryid: function (entryid) {
+        var folders = this.getAllContactFolders(false);
 
-		for (var i = 0; i < folders.length; i++) {
-			if (folders[i].entryid == entryid) {
-				return folders[i];
-			}
-		}
+        for (var i = 0; i < folders.length; i++) {
+            if (folders[i].entryid == entryid) {
+                return folders[i];
+            }
+        }
 
-		return container.getHierarchyStore().getDefaultFolder('contact');
-	},
+        return container.getHierarchyStore().getDefaultFolder('contact');
+    },
 
-	/**
-	 * Reloads the data of the grid
-	 * @private
-	 */
-	reloadGridStore: function (contactdata) {
-		var parsedData = [];
+    /**
+     * Reloads the data of the grid
+     * @private
+     */
+    reloadGridStore: function (contactdata) {
+        var parsedData = [];
 
-		if (contactdata) {
-			parsedData = new Array(contactdata.contacts.length);
-			var i = 0;
-			for (i = 0; i < contactdata.contacts.length; i++) {
+        if (contactdata) {
+            parsedData = new Array(contactdata.contacts.length);
+            var i = 0;
+            for (i = 0; i < contactdata.contacts.length; i++) {
 
-				parsedData[i] = [
-					contactdata.contacts[i]["display_name"],
-					contactdata.contacts[i]["given_name"],
-					contactdata.contacts[i]["surname"],
-					contactdata.contacts[i]["company_name"],
-					contactdata.contacts[i]
-				];
-			}
-		} else {
-			return null;
-		}
+                parsedData[i] = [
+                    contactdata.contacts[i]["display_name"],
+                    contactdata.contacts[i]["given_name"],
+                    contactdata.contacts[i]["surname"],
+                    contactdata.contacts[i]["company_name"],
+                    contactdata.contacts[i]
+                ];
+            }
+        } else {
+            return null;
+        }
 
-		this.store.loadData(parsedData, false);
-	},
+        this.store.loadData(parsedData, false);
+    },
 
-	/**
-	 * Init embedded form, this is the form that is
-	 * posted and contains the attachments
-	 * @private
-	 */
-	createGrid: function () {
-		return {
-			xtype      : 'grid',
-			ref        : 'contactGrid',
-			columnWidth: 1.0,
-			store      : this.store,
-			width      : '100%',
-			height     : 300,
-			title      : 'Select contacts to import',
-			frame      : false,
-			viewConfig : {
-				forceFit: true
-			},
-			colModel   : new Ext.grid.ColumnModel({
-				defaults: {
-					width   : 300,
-					sortable: true
-				},
-				columns : [
-					{id: 'Displayname', header: 'Displayname', width: 350, sortable: true, dataIndex: 'display_name'},
-					{header: 'Firstname', width: 200, sortable: true, dataIndex: 'given_name'},
-					{header: 'Lastname', width: 200, sortable: true, dataIndex: 'surname'},
-					{header: 'Company', sortable: true, dataIndex: 'company_name'}
-				]
-			}),
-			sm         : new Ext.grid.RowSelectionModel({multiSelect: true})
-		}
-	},
+    /**
+     * Init embedded form, this is the form that is
+     * posted and contains the attachments
+     * @private
+     */
+    createGrid: function () {
+        return {
+            xtype: 'grid',
+            ref: 'contactGrid',
+            columnWidth: 1.0,
+            store: this.store,
+            width: '100%',
+            height: 300,
+            title: dgettext('plugin_contactimporter', 'Select contacts to import'),
+            frame: false,
+            viewConfig: {
+                forceFit: true
+            },
+            colModel: new Ext.grid.ColumnModel({
+                defaults: {
+                    width: 300,
+                    sortable: true
+                },
+                columns: [
+                    {id: 'Displayname', header: dgettext('plugin_contactimporter', 'Displayname'), width: 350, sortable: true, dataIndex: 'display_name'},
+                    {header: dgettext('plugin_contactimporter', 'Firstname'), width: 200, sortable: true, dataIndex: 'given_name'},
+                    {header: dgettext('plugin_contactimporter', 'Lastname'), width: 200, sortable: true, dataIndex: 'surname'},
+                    {header: dgettext('plugin_contactimporter', 'Company'), sortable: true, dataIndex: 'company_name'}
+                ]
+            }),
+            sm: new Ext.grid.RowSelectionModel({multiSelect: true})
+        }
+    },
 
-	/**
-	 * Generate the UI calendar select box.
-	 * @returns {*}
-	 */
-	createSelectBox: function () {
-		var myStore = this.getAllContactFolders(true);
+    /**
+     * Generate the UI calendar select box.
+     * @returns {*}
+     */
+    createSelectBox: function () {
+        var myStore = this.getAllContactFolders(true);
 
-		return {
-			xtype         : "selectbox",
-			ref           : 'addressbookSelector',
-			editable      : false,
-			name          : "choosen_addressbook",
-			value         : Ext.isEmpty(this.folder) ? this.getContactFolderByName(container.getSettingsModel().get("zarafa/v1/plugins/contactimporter/default_addressbook")).entryid : this.folder,
-			width         : 100,
-			fieldLabel    : "Select folder",
-			store         : myStore,
-			mode          : 'local',
-			labelSeperator: ":",
-			border        : false,
-			anchor        : "100%",
-			scope         : this,
-			hidden        : Ext.isEmpty(this.folder) ? false : true,
-			allowBlank    : false
-		}
-	},
+        return {
+            xtype: "selectbox",
+            ref: 'addressbookSelector',
+            editable: false,
+            name: "choosen_addressbook",
+            value: Ext.isEmpty(this.folder) ? this.getContactFolderByName(container.getSettingsModel().get("zarafa/v1/plugins/contactimporter/default_addressbook")).entryid : this.folder,
+            width: 100,
+            fieldLabel: dgettext('plugin_contactimporter', 'Select folder'),
+            store: myStore,
+            mode: 'local',
+            labelSeperator: ":",
+            border: false,
+            anchor: "100%",
+            scope: this,
+            hidden: Ext.isEmpty(this.folder) ? false : true,
+            allowBlank: false
+        }
+    },
 
-	/**
-	 * Generate the UI upload field.
-	 * @returns {*}
-	 */
-	createUploadField: function () {
-		return {
-			xtype      : "fileuploadfield",
-			ref        : 'contactfileuploadfield',
-			columnWidth: 1.0,
-			id         : 'form-file',
-			name       : 'vcfdata',
-			emptyText  : 'Select an .vcf addressbook',
-			border     : false,
-			anchor     : "100%",
-			height     : "30",
-			scope      : this,
-			allowBlank : false,
-			listeners  : {
-				'fileselected': this.onFileSelected,
-				scope         : this
-			}
-		}
-	},
+    /**
+     * Generate the UI upload field.
+     * @returns {*}
+     */
+    createUploadField: function () {
+        return {
+            xtype: "fileuploadfield",
+            ref: 'contactfileuploadfield',
+            columnWidth: 1.0,
+            id: 'form-file',
+            name: 'vcfdata',
+            emptyText: dgettext('plugin_contactimporter', 'Select an .vcf addressbook'),
+            border: false,
+            anchor: "100%",
+            height: "30",
+            scope: this,
+            allowBlank: false,
+            listeners: {
+                'fileselected': this.onFileSelected,
+                scope: this
+            }
+        }
+    },
 
-	/**
-	 * Generate the UI submit button.
-	 * @returns {*}
-	 */
-	createSubmitButton: function () {
-		return {
-			xtype     : "button",
-			ref       : "../submitButton",
-			disabled  : true,
-			width     : 100,
-			border    : false,
-			text      : _("Import"),
-			anchor    : "100%",
-			handler   : this.importCheckedContacts,
-			scope     : this,
-			allowBlank: false
-		}
-	},
+    /**
+     * Generate the UI submit button.
+     * @returns {*}
+     */
+    createSubmitButton: function () {
+        return {
+            xtype: "button",
+            ref: "../submitButton",
+            disabled: true,
+            width: 100,
+            border: false,
+            text: dgettext('plugin_contactimporter', 'Import'),
+            anchor: "100%",
+            handler: this.importCheckedContacts,
+            scope: this,
+            allowBlank: false
+        }
+    },
 
-	/**
-	 * Generate the UI submit all button.
-	 * @returns {*}
-	 */
-	createSubmitAllButton: function () {
-		return {
-			xtype     : "button",
-			ref       : "../submitAllButton",
-			disabled  : true,
-			width     : 100,
-			border    : false,
-			text      : _("Import All"),
-			anchor    : "100%",
-			handler   : this.importAllContacts,
-			scope     : this,
-			allowBlank: false
-		}
-	},
+    /**
+     * Generate the UI submit all button.
+     * @returns {*}
+     */
+    createSubmitAllButton: function () {
+        return {
+            xtype: "button",
+            ref: "../submitAllButton",
+            disabled: true,
+            width: 100,
+            border: false,
+            text: dgettext('plugin_contactimporter', 'Import All'),
+            anchor: "100%",
+            handler: this.importAllContacts,
+            scope: this,
+            allowBlank: false
+        }
+    },
 
-	/**
-	 * Generate the UI cancel button.
-	 * @returns {*}
-	 */
-	createCancelButton: function () {
-		return {
-			xtype     : "button",
-			width     : 100,
-			border    : false,
-			text      : _("Cancel"),
-			anchor    : "100%",
-			handler   : this.close,
-			scope     : this,
-			allowBlank: false
-		}
-	},
+    /**
+     * Generate the UI cancel button.
+     * @returns {*}
+     */
+    createCancelButton: function () {
+        return {
+            xtype: "button",
+            width: 100,
+            border: false,
+            text: dgettext('plugin_contactimporter', 'Cancel'),
+            anchor: "100%",
+            handler: this.close,
+            scope: this,
+            allowBlank: false
+        }
+    },
 
-	/**
-	 * This is called when a file has been seleceted in the file dialog
-	 * in the {@link Ext.ux.form.FileUploadField} and the dialog is closed
-	 * @param {Ext.ux.form.FileUploadField} uploadField being added a file to
-	 */
-	onFileSelected: function (uploadField) {
-		var form = this.addContactFormPanel.getForm();
+    /**
+     * This is called when a file has been seleceted in the file dialog
+     * in the {@link Ext.ux.form.FileUploadField} and the dialog is closed
+     * @param {Ext.ux.form.FileUploadField} uploadField being added a file to
+     */
+    onFileSelected: function (uploadField) {
+        var form = this.addContactFormPanel.getForm();
 
-		if (form.isValid()) {
-			form.submit({
-				waitMsg: 'Uploading and parsing contacts...',
-				url    : 'plugins/contactimporter/php/upload.php',
-				failure: function (file, action) {
-					this.submitButton.disable();
-					this.submitAllButton.disable();
-					Zarafa.common.dialogs.MessageBox.show({
-						title  : _('Error'),
-						msg    : _(action.result.error),
-						icon   : Zarafa.common.dialogs.MessageBox.ERROR,
-						buttons: Zarafa.common.dialogs.MessageBox.OK
-					});
-				},
-				success: function (file, action) {
-					uploadField.reset();
-					this.vcffile = action.result.vcf_file;
+        if (form.isValid()) {
+            form.submit({
+                waitMsg: dgettext('plugin_contactimporter', 'Uploading and parsing contacts...'),
+                url: 'plugins/contactimporter/php/upload.php',
+                failure: function (file, action) {
+                    this.submitButton.disable();
+                    this.submitAllButton.disable();
+                    Zarafa.common.dialogs.MessageBox.show({
+                        title: dgettext('plugin_contactimporter', 'Error'),
+                        msg: _(action.result.error),
+                        icon: Zarafa.common.dialogs.MessageBox.ERROR,
+                        buttons: Zarafa.common.dialogs.MessageBox.OK
+                    });
+                },
+                success: function (file, action) {
+                    uploadField.reset();
+                    this.vcffile = action.result.vcf_file;
 
-					this.parseContacts(this.vcffile);
-				},
-				scope  : this
-			});
-		}
-	},
+                    this.parseContacts(this.vcffile);
+                },
+                scope: this
+            });
+        }
+    },
 
-	/**
-	 * Start request to server to parse the given vCard file.
-	 * @param {string} vcfPath
-	 */
-	parseContacts: function (vcfPath) {
-		this.loadMask.show();
+    /**
+     * Start request to server to parse the given vCard file.
+     * @param {string} vcfPath
+     */
+    parseContacts: function (vcfPath) {
+        this.loadMask.show();
 
-		// call export function here!
-		var responseHandler = new Zarafa.plugins.contactimporter.data.ResponseHandler({
-			successCallback: this.handleParsingResult.createDelegate(this)
-		});
+        // call export function here!
+        var responseHandler = new Zarafa.plugins.contactimporter.data.ResponseHandler({
+            successCallback: this.handleParsingResult.createDelegate(this)
+        });
 
-		container.getRequest().singleRequest(
-			'contactmodule',
-			'load',
-			{
-				vcf_filepath: vcfPath
-			},
-			responseHandler
-		);
-	},
+        container.getRequest().singleRequest(
+            'contactmodule',
+            'load',
+            {
+                vcf_filepath: vcfPath
+            },
+            responseHandler
+        );
+    },
 
-	/**
-	 * Callback for the parsing request.
-	 * @param {Object} response
-	 */
-	handleParsingResult: function (response) {
-		this.loadMask.hide();
+    /**
+     * Callback for the parsing request.
+     * @param {Object} response
+     */
+    handleParsingResult: function (response) {
+        this.loadMask.hide();
 
-		if (response["status"] == true) {
-			this.submitButton.enable();
-			this.submitAllButton.enable();
+        if (response["status"] == true) {
+            this.submitButton.enable();
+            this.submitAllButton.enable();
 
-			this.reloadGridStore(response.parsed);
-		} else {
-			this.submitButton.disable();
-			this.submitAllButton.disable();
-			Zarafa.common.dialogs.MessageBox.show({
-				title  : _('Parser Error'),
-				msg    : _(response["message"]),
-				icon   : Zarafa.common.dialogs.MessageBox.ERROR,
-				buttons: Zarafa.common.dialogs.MessageBox.OK
-			});
-		}
-	},
+            this.reloadGridStore(response.parsed);
+        } else {
+            this.submitButton.disable();
+            this.submitAllButton.disable();
+            Zarafa.common.dialogs.MessageBox.show({
+                title: dgettext('plugin_contactimporter', 'Parser Error'),
+                msg: _(response["message"]),
+                icon: Zarafa.common.dialogs.MessageBox.ERROR,
+                buttons: Zarafa.common.dialogs.MessageBox.OK
+            });
+        }
+    },
 
-	/**
-	 * Close the UI dialog.
-	 */
-	close: function () {
-		this.addContactFormPanel.getForm().reset();
-		this.dialog.close()
-	},
+    /**
+     * Close the UI dialog.
+     */
+    close: function () {
+        this.addContactFormPanel.getForm().reset();
+        this.dialog.close()
+    },
 
-	/**
-	 * Create a request to import all selected contacts.
-	 */
-	importCheckedContacts: function () {
-		var newRecords = this.contactGrid.selModel.getSelections();
-		this.importContacts(newRecords);
-	},
+    /**
+     * Create a request to import all selected contacts.
+     */
+    importCheckedContacts: function () {
+        var newRecords = this.contactGrid.selModel.getSelections();
+        this.importContacts(newRecords);
+    },
 
-	/**
-	 * Check all contacts and import them.
-	 */
-	importAllContacts: function () {
-		//receive Records from grid rows
-		this.contactGrid.selModel.selectAll();  // select all entries
-		var newRecords = this.contactGrid.selModel.getSelections();
-		this.importContacts(newRecords);
-	},
+    /**
+     * Check all contacts and import them.
+     */
+    importAllContacts: function () {
+        //receive Records from grid rows
+        this.contactGrid.selModel.selectAll();  // select all entries
+        var newRecords = this.contactGrid.selModel.getSelections();
+        this.importContacts(newRecords);
+    },
 
-	/**
-	 * This function stores all given events to the contact store
-	 * @param {array} contacts
-	 */
-	importContacts: function (contacts) {
-		//receive existing contact store
-		var folderValue = this.addressbookSelector.getValue();
+    /**
+     * This function stores all given events to the contact store
+     * @param {array} contacts
+     */
+    importContacts: function (contacts) {
+        //receive existing contact store
+        var folderValue = this.addressbookSelector.getValue();
 
-		if (folderValue == undefined) { // no addressbook choosen
-			Zarafa.common.dialogs.MessageBox.show({
-				title  : _('Error'),
-				msg    : _('You have to choose an addressbook!'),
-				icon   : Zarafa.common.dialogs.MessageBox.ERROR,
-				buttons: Zarafa.common.dialogs.MessageBox.OK
-			});
-		} else {
-			if (this.contactGrid.selModel.getCount() < 1) {
-				Zarafa.common.dialogs.MessageBox.show({
-					title  : _('Error'),
-					msg    : _('You have to choose at least one contact to import!'),
-					icon   : Zarafa.common.dialogs.MessageBox.ERROR,
-					buttons: Zarafa.common.dialogs.MessageBox.OK
-				});
-			} else {
-				var contactFolder = this.getContactFolderByEntryid(folderValue);
+        if (folderValue == undefined) { // no addressbook choosen
+            Zarafa.common.dialogs.MessageBox.show({
+                title: dgettext('plugin_contactimporter', 'Error'),
+                msg: dgettext('plugin_contactimporter', 'You have to choose an addressbook!'),
+                icon: Zarafa.common.dialogs.MessageBox.ERROR,
+                buttons: Zarafa.common.dialogs.MessageBox.OK
+            });
+        } else {
+            if (this.contactGrid.selModel.getCount() < 1) {
+                Zarafa.common.dialogs.MessageBox.show({
+                    title: dgettext('plugin_contactimporter', 'Error'),
+                    msg: dgettext('plugin_contactimporter', 'You have to choose at least one contact to import!'),
+                    icon: Zarafa.common.dialogs.MessageBox.ERROR,
+                    buttons: Zarafa.common.dialogs.MessageBox.OK
+                });
+            } else {
+                var contactFolder = this.getContactFolderByEntryid(folderValue);
 
-				this.loadMask.show();
-				var uids = [];
+                this.loadMask.show();
+                var uids = [];
 
-				//receive Records from grid rows
-				Ext.each(contacts, function (newRecord) {
-					uids.push(newRecord.data.record.internal_fields.contact_uid);
-				}, this);
+                //receive Records from grid rows
+                Ext.each(contacts, function (newRecord) {
+                    uids.push(newRecord.data.record.internal_fields.contact_uid);
+                }, this);
 
-				var responseHandler = new Zarafa.plugins.contactimporter.data.ResponseHandler({
-					successCallback: this.importContactsDone.createDelegate(this)
-				});
+                var responseHandler = new Zarafa.plugins.contactimporter.data.ResponseHandler({
+                    successCallback: this.importContactsDone.createDelegate(this)
+                });
 
-				container.getRequest().singleRequest(
-					'contactmodule',
-					'import',
-					{
-						storeid     : contactFolder.store_entryid,
-						folderid    : contactFolder.entryid,
-						uids        : uids,
-						vcf_filepath: this.vcffile
-					},
-					responseHandler
-				);
-			}
-		}
-	},
+                container.getRequest().singleRequest(
+                    'contactmodule',
+                    'import',
+                    {
+                        storeid: contactFolder.store_entryid,
+                        folderid: contactFolder.entryid,
+                        uids: uids,
+                        vcf_filepath: this.vcffile
+                    },
+                    responseHandler
+                );
+            }
+        }
+    },
 
-	/**
-	 * Callback for the import request.
-	 * @param {Object} response
-	 */
-	importContactsDone: function (response) {
-		this.loadMask.hide();
-		this.dialog.close();
-		if (response.status == true) {
-			container.getNotifier().notify('info', 'Imported', 'Imported ' + response.count + ' contacts. Please reload your addressbook!');
-		} else {
-			Zarafa.common.dialogs.MessageBox.show({
-				title  : _('Error'),
-				msg    : _('Import failed: ') + response.message,
-				icon   : Zarafa.common.dialogs.MessageBox.ERROR,
-				buttons: Zarafa.common.dialogs.MessageBox.OK
-			});
-		}
-	}
+    /**
+     * Callback for the import request.
+     * @param {Object} response
+     */
+    importContactsDone: function (response) {
+        this.loadMask.hide();
+        this.dialog.close();
+        if (response.status == true) {
+            // # TRANSLATORS: {0} will be replaced by the number of contacts that were imported
+            container.getNotifier().notify('info', dgettext('plugin_contactimporter', 'Imported'), String.format(dgettext('plugin_contactimporter', 'Imported {0} contacts. Please reload your addressbook!'), response.count));
+        } else {
+            Zarafa.common.dialogs.MessageBox.show({
+                title: dgettext('plugin_contactimporter', 'Error'),
+                // # TRANSLATORS: {0} will be replaced by the error message
+                msg: String.format(dgettext('plugin_contactimporter', 'Import failed: {0}'), response.message),
+                icon: Zarafa.common.dialogs.MessageBox.ERROR,
+                buttons: Zarafa.common.dialogs.MessageBox.OK
+            });
+        }
+    }
 });
 
 Ext.reg('contactimporter.importcontactpanel', Zarafa.plugins.contactimporter.dialogs.ImportPanel);
diff --git a/js/dialogs/fields.txt b/js/dialogs/fields.txt
deleted file mode 100644
index 4648dc5..0000000
--- a/js/dialogs/fields.txt
+++ /dev/null
@@ -1,826 +0,0 @@
-access
-	
-
-2
-
-	
-address_book_long
-	
-
-0
-
-	
-address_book_mv
-	
-
-null
-
-	
-address_type
-	
-
-"SMTP"
-
-	
-anniversary_eventid
-	
-
-""
-
-	
-assistant
-	
-
-""
-
-	
-assistant_telephone_number
-	
-
-""
-
-	
-birthday
-	
-
-null
-
-	
-birthday_eventid
-	
-
-""
-
-	
-body
-	
-
-""
-
-	
-business2_telephone_number
-	
-
-""
-
-	
-business_address
-	
-
-""
-
-	
-business_address_city
-	
-
-""
-
-	
-business_address_country
-	
-
-""
-
-	
-business_address_postal_code
-	
-
-""
-
-	
-business_address_state
-	
-
-""
-
-	
-business_address_street
-	
-
-""
-
-	
-business_fax_number
-	
-
-""
-
-	
-business_home_page
-	
-
-""
-
-	
-business_telephone_number
-	
-
-""
-
-	
-callback_telephone_number
-	
-
-""
-
-	
-car_telephone_number
-	
-
-""
-
-	
-categories
-	
-
-""
-
-	
-cellular_telephone_number
-	
-
-""
-
-	
-company_name
-	
-
-"testcompany"
-
-	
-company_telephone_number
-	
-
-""
-
-	
-contacts
-	
-
-""
-
-	
-contacts_string
-	
-
-""
-
-	
-creation_time
-	
-
-null
-
-	
-department_name
-	
-
-"departm"
-
-	
-display_bcc
-	
-
-""
-
-	
-display_cc
-	
-
-""
-
-	
-display_name
-	
-
-"Dr. testf testm testl Jr."
-
-	
-display_name_prefix
-	
-
-"Dr."
-
-	
-display_to
-	
-
-""
-
-	
-dstendday
-	
-
-""
-
-	
-dstendhour
-	
-
-""
-
-	
-dstendmonth
-	
-
-""
-
-	
-dstendweek
-	
-
-""
-
-	
-dststartday
-	
-
-""
-
-	
-dststarthour
-	
-
-""
-
-	
-dststartmonth
-	
-
-""
-
-	
-dststartweek
-	
-
-""
-
-	
-email_address
-	
-
-""
-
-	
-email_address_1
-	
-
-""
-
-	
-email_address_2
-	
-
-""
-
-	
-email_address_3
-	
-
-""
-
-	
-email_address_display_name_1
-	
-
-""
-
-	
-email_address_display_name_2
-	
-
-""
-
-	
-email_address_display_name_3
-	
-
-""
-
-	
-email_address_display_name_email_1
-	
-
-""
-
-	
-email_address_display_name_email_2
-	
-
-""
-
-	
-email_address_display_name_email_3
-	
-
-""
-
-	
-email_address_entryid_1
-	
-
-""
-
-	
-email_address_entryid_2
-	
-
-""
-
-	
-email_address_entryid_3
-	
-
-""
-
-	
-email_address_type_1
-	
-
-""
-
-	
-email_address_type_2
-	
-
-""
-
-	
-email_address_type_3
-	
-
-""
-
-	
-email_index
-	
-
--1
-
-	
-fax_1_address_type
-	
-
-""
-
-	
-fax_1_email_address
-	
-
-""
-
-	
-fax_1_original_display_name
-	
-
-""
-
-	
-fax_1_original_entryid
-	
-
-""
-
-	
-fax_2_address_type
-	
-
-""
-
-	
-fax_2_email_address
-	
-
-""
-
-	
-fax_2_original_display_name
-	
-
-""
-
-	
-fax_2_original_entryid
-	
-
-""
-
-	
-fax_3_address_type
-	
-
-""
-
-	
-fax_3_email_address
-	
-
-""
-
-	
-fax_3_original_display_name
-	
-
-""
-
-	
-fax_3_original_entryid
-	
-
-""
-
-	
-fileas
-	
-
-"testl, testf testm"
-
-	
-fileas_selection
-	
-
--1
-
-	
-generation
-	
-
-"Jr."
-
-	
-given_name
-	
-
-"testf"
-
-	
-hasattach
-	
-
-false
-
-	
-home2_telephone_number
-	
-
-""
-
-	
-home_address
-	
-
-""
-
-	
-home_address_city
-	
-
-""
-
-	
-home_address_country
-	
-
-""
-
-	
-home_address_postal_code
-	
-
-""
-
-	
-home_address_state
-	
-
-""
-
-	
-home_address_street
-	
-
-""
-
-	
-home_fax_number
-	
-
-""
-
-	
-home_telephone_number
-	
-
-""
-
-	
-html_body
-	
-
-"<font face="tahoma"><br></font>"
-
-	
-icon_index
-	
-
-512
-
-	
-im
-	
-
-""
-
-	
-isHTML
-	
-
-false
-
-	
-isdn_number
-	
-
-""
-
-	
-last_modification_time
-	
-
-null
-
-	
-mailing_address
-	
-
-""
-
-	
-manager_name
-	
-
-""
-
-	
-message_class
-	
-
-"IPM.Contact"
-
-	
-message_flags
-	
-
-1
-
-	
-message_size
-	
-
-""
-
-	
-middle_name
-	
-
-"testm"
-
-	
-nickname
-	
-
-"nickn"
-
-	
-normalized_subject
-	
-
-""
-
-	
-object_type
-	
-
-5
-
-	
-office_location
-	
-
-"olocation"
-
-	
-other_address
-	
-
-""
-
-	
-other_address_city
-	
-
-""
-
-	
-other_address_country
-	
-
-""
-
-	
-other_address_postal_code
-	
-
-""
-
-	
-other_address_state
-	
-
-""
-
-	
-other_address_street
-	
-
-""
-
-	
-other_telephone_number
-	
-
-""
-
-	
-pager_telephone_number
-	
-
-""
-
-	
-primary_fax_number
-	
-
-""
-
-	
-primary_telephone_number
-	
-
-""
-
-	
-private
-	
-
-false
-
-	
-profession
-	
-
-"profess"
-
-	
-radio_telephone_number
-	
-
-""
-
-	
-read_receipt_requested
-	
-
-false
-
-	
-sender_address_type
-	
-
-""
-
-	
-sender_email_address
-	
-
-""
-
-	
-sender_entryid
-	
-
-""
-
-	
-sender_name
-	
-
-""
-
-	
-sender_search_key
-	
-
-""
-
-	
-sensitivity
-	
-
-0
-
-	
-sent_representing_address_type
-	
-
-""
-
-	
-sent_representing_email_address
-	
-
-""
-
-	
-sent_representing_entryid
-	
-
-""
-
-	
-sent_representing_name
-	
-
-""
-
-	
-sent_representing_search_key
-	
-
-""
-
-	
-spouse_name
-	
-
-""
-
-	
-subject
-	
-
-"testf testm testl"
-
-	
-surname
-	
-
-"testl"
-
-	
-telex_telephone_number
-	
-
-""
-
-	
-timezone
-	
-
-""
-
-	
-timezonedst
-	
-
-""
-
-	
-title
-	
-
-"jobt"
-
-	
-ttytdd_telephone_number
-	
-
-""
-
-	
-unk
-	
-
-""
-
-	
-webpage
-	
-
-""
-
-	
-wedding_anniversary
-	
-
-null
\ No newline at end of file
diff --git a/js/plugin.contactimporter.js b/js/plugin.contactimporter.js
index 88271be..998b951 100644
--- a/js/plugin.contactimporter.js
+++ b/js/plugin.contactimporter.js
@@ -1,5 +1,5 @@
 /**
- * plugin.contactimporter.js zarafa contactimporter
+ * plugin.contactimporter.js, Kopano Webapp contact to vcf im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
  * Copyright (C) 2012-2016 Christoph Haas
@@ -24,274 +24,275 @@ Ext.namespace("Zarafa.plugins.contactimporter");									// Assign the right nam
 
 Zarafa.plugins.contactimporter.ImportPlugin = Ext.extend(Zarafa.core.Plugin, {		// create new import plugin
 
-	/**
-	 * @constructor
-	 * @param {Object} config Configuration object
-	 *
-	 */
-	constructor: function (config) {
-		config = config || {};
+    /**
+     * @constructor
+     * @param {Object} config Configuration object
+     *
+     */
+    constructor: function (config) {
+        config = config || {};
 
-		Zarafa.plugins.contactimporter.ImportPlugin.superclass.constructor.call(this, config);
-	},
+        Zarafa.plugins.contactimporter.ImportPlugin.superclass.constructor.call(this, config);
+    },
 
-	/**
-	 * initialises insertion point for plugin
-	 * @protected
-	 */
-	initPlugin: function () {
-		Zarafa.plugins.contactimporter.ImportPlugin.superclass.initPlugin.apply(this, arguments);
+    /**
+     * initialises insertion point for plugin
+     * @protected
+     */
+    initPlugin: function () {
+        Zarafa.plugins.contactimporter.ImportPlugin.superclass.initPlugin.apply(this, arguments);
 
-		/* our panel */
-		Zarafa.core.data.SharedComponentType.addProperty('plugins.contactimporter.dialogs.importcontacts');
+        /* our panel */
+        Zarafa.core.data.SharedComponentType.addProperty('plugins.contactimporter.dialogs.importcontacts');
 
-		/* directly import received vcfs */
-		this.registerInsertionPoint('common.contextmenu.attachment.actions', this.createAttachmentImportButton, this);
+        /* directly import received vcfs */
+        this.registerInsertionPoint('common.contextmenu.attachment.actions', this.createAttachmentImportButton, this);
 
-		/* export a contact via rightclick */
-		this.registerInsertionPoint('context.contact.contextmenu.actions', this.createItemExportInsertionPoint, this);
-	},
+        /* export a contact via rightclick */
+        this.registerInsertionPoint('context.contact.contextmenu.actions', this.createItemExportInsertionPoint, this);
+    },
 
-	/**
-	 * This method hooks to the contact context menu and allows users to export users to vcf.
-	 *
-	 * @param include
-	 * @param btn
-	 * @returns {Object}
-	 */
-	createItemExportInsertionPoint: function (include, btn) {
-		return {
-			text   : dgettext('plugin_files', 'Export vCard'),
-			handler: this.exportToVCF.createDelegate(this, [btn]),
-			scope  : this,
-			iconCls: 'icon_contactimporter_export'
-		};
-	},
+    /**
+     * This method hooks to the contact context menu and allows users to export users to vcf.
+     *
+     * @param include
+     * @param btn
+     * @returns {Object}
+     */
+    createItemExportInsertionPoint: function (include, btn) {
+        return {
+            text: dgettext('plugin_contactimporter', 'Export vCard'),
+            handler: this.exportToVCF.createDelegate(this, [btn]),
+            scope: this,
+            iconCls: 'icon_contactimporter_export'
+        };
+    },
 
-	/**
-	 * Generates a request to download the selected records as vCard.
-	 * @param {Ext.Button} btn
-	 */
-	exportToVCF: function (btn) {
-		if (btn.records.length == 0) {
-			return; // skip if no records where given!
-		}
+    /**
+     * Generates a request to download the selected records as vCard.
+     * @param {Ext.Button} btn
+     */
+    exportToVCF: function (btn) {
+        if (btn.records.length == 0) {
+            return; // skip if no records where given!
+        }
 
-		var recordIds = [];
+        var recordIds = [];
 
-		for (var i = 0; i < btn.records.length; i++) {
-			recordIds.push(btn.records[i].get("entryid"));
-		}
+        for (var i = 0; i < btn.records.length; i++) {
+            recordIds.push(btn.records[i].get("entryid"));
+        }
 
-		var responseHandler = new Zarafa.plugins.contactimporter.data.ResponseHandler({
-			successCallback: this.downloadVCF,
-			scope          : this
-		});
+        var responseHandler = new Zarafa.plugins.contactimporter.data.ResponseHandler({
+            successCallback: this.downloadVCF,
+            scope: this
+        });
 
-		// request attachment preperation
-		container.getRequest().singleRequest(
-			'contactmodule',
-			'export',
-			{
-				storeid: btn.records[0].get("store_entryid"),
-				records: recordIds
-			},
-			responseHandler
-		);
-	},
+        // request attachment preperation
+        container.getRequest().singleRequest(
+            'contactmodule',
+            'export',
+            {
+                storeid: btn.records[0].get("store_entryid"),
+                records: recordIds
+            },
+            responseHandler
+        );
+    },
 
-	/**
-	 * Callback for the export request.
-	 * @param {Object} response
-	 */
-	downloadVCF: function (response) {
-		if (response.status == false) {
-			Zarafa.common.dialogs.MessageBox.show({
-				title  : dgettext('plugin_files', 'Warning'),
-				msg    : dgettext('plugin_files', response.message),
-				icon   : Zarafa.common.dialogs.MessageBox.WARNING,
-				buttons: Zarafa.common.dialogs.MessageBox.OK
-			});
-		} else {
-			var downloadFrame = Ext.getBody().createChild({
-				tag: 'iframe',
-				cls: 'x-hidden'
-			});
+    /**
+     * Callback for the export request.
+     * @param {Object} response
+     */
+    downloadVCF: function (response) {
+        if (response.status == false) {
+            Zarafa.common.dialogs.MessageBox.show({
+                title: dgettext('plugin_contactimporter', 'Warning'),
+                msg: response.message,
+                icon: Zarafa.common.dialogs.MessageBox.WARNING,
+                buttons: Zarafa.common.dialogs.MessageBox.OK
+            });
+        } else {
+            var downloadFrame = Ext.getBody().createChild({
+                tag: 'iframe',
+                cls: 'x-hidden'
+            });
 
-			var url = document.URL;
-			var link = url.substring(0, url.lastIndexOf('/') + 1);
+            var url = document.URL;
+            var link = url.substring(0, url.lastIndexOf('/') + 1);
 
-			link += "index.php?sessionid=" + container.getUser().getSessionId() + "&load=custom&name=download_vcf";
-			link = Ext.urlAppend(link, "token=" + encodeURIComponent(response.download_token));
-			link = Ext.urlAppend(link, "filename=" + encodeURIComponent(response.filename));
+            link += "index.php?sessionid=" + container.getUser().getSessionId() + "&load=custom&name=download_vcf";
+            link = Ext.urlAppend(link, "token=" + encodeURIComponent(response.download_token));
+            link = Ext.urlAppend(link, "filename=" + encodeURIComponent(response.filename));
 
-			downloadFrame.dom.contentWindow.location = link;
-		}
-	},
+            downloadFrame.dom.contentWindow.location = link;
+        }
+    },
 
-	/**
-	 * Insert import button in all attachment suggestions
+    /**
+     * Insert import button in all attachment suggestions
 
-	 * @return {Object} Configuration object for a {@link Ext.Button button}
-	 */
-	createAttachmentImportButton: function (include, btn) {
-		return {
-			text      : _('Import to Contacts'),
-			handler   : this.getAttachmentFileName.createDelegate(this, [btn]),
-			scope     : this,
-			iconCls   : 'icon_contactimporter_button',
-			beforeShow: function (item, record) {
-				var extension = record.data.name.split('.').pop().toLowerCase();
+     * @return {Object} Configuration object for a {@link Ext.Button button}
+     */
+    createAttachmentImportButton: function (include, btn) {
+        return {
+            text: dgettext('plugin_contactimporter', 'Import to Contacts'),
+            handler: this.getAttachmentFileName.createDelegate(this, [btn]),
+            scope: this,
+            iconCls: 'icon_contactimporter_button',
+            beforeShow: function (item, record) {
+                var extension = record.data.name.split('.').pop().toLowerCase();
 
-				if (record.data.filetype == "text/vcard" || record.data.filetype == "text/x-vcard" || extension == "vcf" || extension == "vcard") {
-					item.setVisible(true);
-				} else {
-					item.setVisible(false);
-				}
-			}
-		};
-	},
+                if (record.data.filetype == "text/vcard" || record.data.filetype == "text/x-vcard" || extension == "vcf" || extension == "vcard") {
+                    item.setVisible(true);
+                } else {
+                    item.setVisible(false);
+                }
+            }
+        };
+    },
 
-	/**
-	 * Callback for getAttachmentFileName
-	 * @param {Object} response
-	 */
-	gotAttachmentFileName: function (response) {
-		if (response.status == true) {
-			this.openImportDialog(response.tmpname);
-		} else {
-			Zarafa.common.dialogs.MessageBox.show({
-				title  : _('Error'),
-				msg    : _(response["message"]),
-				icon   : Zarafa.common.dialogs.MessageBox.ERROR,
-				buttons: Zarafa.common.dialogs.MessageBox.OK
-			});
-		}
-	},
+    /**
+     * Callback for getAttachmentFileName
+     * @param {Object} response
+     */
+    gotAttachmentFileName: function (response) {
+        if (response.status == true) {
+            this.openImportDialog(response.tmpname);
+        } else {
+            Zarafa.common.dialogs.MessageBox.show({
+                title: dgettext('plugin_contactimporter', 'Error'),
+                msg: _(response["message"]),
+                icon: Zarafa.common.dialogs.MessageBox.ERROR,
+                buttons: Zarafa.common.dialogs.MessageBox.OK
+            });
+        }
+    },
 
-	/**
-	 * Clickhandler for the button
-	 * @param {Ext.Button} btn
-	 */
-	getAttachmentFileName: function (btn) {
-		Zarafa.common.dialogs.MessageBox.show({
-			title       : 'Please wait',
-			msg         : 'Loading attachment...',
-			progressText: 'Initializing...',
-			width       : 300,
-			progress    : true,
-			closable    : false
-		});
+    /**
+     * Clickhandler for the button
+     * @param {Ext.Button} btn
+     */
+    getAttachmentFileName: function (btn) {
+        Zarafa.common.dialogs.MessageBox.show({
+            title: dgettext('plugin_contactimporter', 'Please wait'),
+            msg: dgettext('plugin_contactimporter', 'Loading attachment...'),
+            progressText: dgettext('plugin_contactimporter', 'Initializing...'),
+            width: 300,
+            progress: true,
+            closable: false
+        });
 
-		// progress bar... ;)
-		var f = function (v) {
-			return function () {
-				if (v == 100) {
-					Zarafa.common.dialogs.MessageBox.hide();
-				} else {
-					Zarafa.common.dialogs.MessageBox.updateProgress(v / 100, Math.round(v) + '% loaded');
-				}
-			};
-		};
+        // progress bar... ;)
+        var f = function (v) {
+            return function () {
+                if (v == 100) {
+                    Zarafa.common.dialogs.MessageBox.hide();
+                } else {
+                    // # TRANSLATORS: {0} will be replaced by the percentage value (0-100)
+                    Zarafa.common.dialogs.MessageBox.updateProgress(v / 100, String.format(dgettext('plugin_contactimporter', '{0}% loaded'), Math.round(v)));
+                }
+            };
+        };
 
-		for (var i = 1; i < 101; i++) {
-			setTimeout(f(i), 20 * i);
-		}
+        for (var i = 1; i < 101; i++) {
+            setTimeout(f(i), 20 * i);
+        }
 
-		/* store the attachment to a temporary folder and prepare it for uploading */
-		var attachmentRecord = btn.records;
-		var attachmentStore = attachmentRecord.store;
+        /* store the attachment to a temporary folder and prepare it for uploading */
+        var attachmentRecord = btn.records;
+        var attachmentStore = attachmentRecord.store;
 
-		var store = attachmentStore.getParentRecord().get('store_entryid');
-		var entryid = attachmentStore.getAttachmentParentRecordEntryId();
-		var attachNum = new Array(1);
-		if (attachmentRecord.get('attach_num') != -1) {
-			attachNum[0] = attachmentRecord.get('attach_num');
-		} else {
-			attachNum[0] = attachmentRecord.get('tmpname');
-		}
-		var dialog_attachments = attachmentStore.getId();
-		var filename = attachmentRecord.data.name;
+        var store = attachmentStore.getParentRecord().get('store_entryid');
+        var entryid = attachmentStore.getAttachmentParentRecordEntryId();
+        var attachNum = new Array(1);
+        if (attachmentRecord.get('attach_num') != -1) {
+            attachNum[0] = attachmentRecord.get('attach_num');
+        } else {
+            attachNum[0] = attachmentRecord.get('tmpname');
+        }
+        var dialog_attachments = attachmentStore.getId();
+        var filename = attachmentRecord.data.name;
 
-		var responseHandler = new Zarafa.plugins.contactimporter.data.ResponseHandler({
-			successCallback: this.gotAttachmentFileName.createDelegate(this),
-			scope          : this
-		});
+        var responseHandler = new Zarafa.plugins.contactimporter.data.ResponseHandler({
+            successCallback: this.gotAttachmentFileName.createDelegate(this),
+            scope: this
+        });
 
-		// request attachment preperation
-		container.getRequest().singleRequest(
-			'contactmodule',
-			'importattachment',
-			{
-				entryid           : entryid,
-				store             : store,
-				attachNum         : attachNum,
-				dialog_attachments: dialog_attachments,
-				filename          : filename
-			},
-			responseHandler
-		);
-	},
+        // request attachment preperation
+        container.getRequest().singleRequest(
+            'contactmodule',
+            'importattachment',
+            {
+                entryid: entryid,
+                store: store,
+                attachNum: attachNum,
+                dialog_attachments: dialog_attachments,
+                filename: filename
+            },
+            responseHandler
+        );
+    },
 
-	/**
-	 * Open the import dialog.
-	 * @param {String} filename
-	 */
-	openImportDialog: function (filename) {
-		var componentType = Zarafa.core.data.SharedComponentType['plugins.contactimporter.dialogs.importcontacts'];
-		var config = {
-			filename: filename,
-			modal   : true
-		};
+    /**
+     * Open the import dialog.
+     * @param {String} filename
+     */
+    openImportDialog: function (filename) {
+        var componentType = Zarafa.core.data.SharedComponentType['plugins.contactimporter.dialogs.importcontacts'];
+        var config = {
+            filename: filename,
+            modal: true
+        };
 
-		Zarafa.core.data.UIFactory.openLayerComponent(componentType, undefined, config);
-	},
+        Zarafa.core.data.UIFactory.openLayerComponent(componentType, undefined, config);
+    },
 
-	/**
-	 * Bid for the type of shared component
-	 * and the given record.
-	 * This will bid on calendar.dialogs.importcontacts
-	 * @param {Zarafa.core.data.SharedComponentType} type Type of component a context can bid for.
-	 * @param {Ext.data.Record} record Optionally passed record.
-	 * @return {Number} The bid for the shared component
-	 */
-	bidSharedComponent: function (type, record) {
-		var bid = -1;
-		switch (type) {
-			case Zarafa.core.data.SharedComponentType['plugins.contactimporter.dialogs.importcontacts']:
-				bid = 1;
-				break;
-			case Zarafa.core.data.SharedComponentType['common.contextmenu']:
-				if (record instanceof Zarafa.core.data.MAPIRecord) {
-					if (record.get('object_type') == Zarafa.core.mapi.ObjectType.MAPI_FOLDER && record.get('container_class') == "IPF.Contact") {
-						bid = 2;
-					}
-				}
-				break;
-		}
-		return bid;
-	},
+    /**
+     * Bid for the type of shared component
+     * and the given record.
+     * This will bid on calendar.dialogs.importcontacts
+     * @param {Zarafa.core.data.SharedComponentType} type Type of component a context can bid for.
+     * @param {Ext.data.Record} record Optionally passed record.
+     * @return {Number} The bid for the shared component
+     */
+    bidSharedComponent: function (type, record) {
+        var bid = -1;
+        switch (type) {
+            case Zarafa.core.data.SharedComponentType['plugins.contactimporter.dialogs.importcontacts']:
+                bid = 1;
+                break;
+            case Zarafa.core.data.SharedComponentType['common.contextmenu']:
+                if (record instanceof Zarafa.core.data.MAPIRecord) {
+                    if (record.get('object_type') == Zarafa.core.mapi.ObjectType.MAPI_FOLDER && record.get('container_class') == "IPF.Contact") {
+                        bid = 2;
+                    }
+                }
+                break;
+        }
+        return bid;
+    },
 
-	/**
-	 * Will return the reference to the shared component.
-	 * Based on the type of component requested a component is returned.
-	 * @param {Zarafa.core.data.SharedComponentType} type Type of component a context can bid for.
-	 * @param {Ext.data.Record} record Optionally passed record.
-	 * @return {Ext.Component} Component
-	 */
-	getSharedComponent: function (type, record) {
-		var component;
-		switch (type) {
-			case Zarafa.core.data.SharedComponentType['plugins.contactimporter.dialogs.importcontacts']:
-				component = Zarafa.plugins.contactimporter.dialogs.ImportContentPanel;
-				break;
-			case Zarafa.core.data.SharedComponentType['common.contextmenu']:
-				component = Zarafa.plugins.contactimporter.ui.ContextMenu;
-				break;
-		}
+    /**
+     * Will return the reference to the shared component.
+     * Based on the type of component requested a component is returned.
+     * @param {Zarafa.core.data.SharedComponentType} type Type of component a context can bid for.
+     * @param {Ext.data.Record} record Optionally passed record.
+     * @return {Ext.Component} Component
+     */
+    getSharedComponent: function (type, record) {
+        var component;
+        switch (type) {
+            case Zarafa.core.data.SharedComponentType['plugins.contactimporter.dialogs.importcontacts']:
+                component = Zarafa.plugins.contactimporter.dialogs.ImportContentPanel;
+                break;
+            case Zarafa.core.data.SharedComponentType['common.contextmenu']:
+                component = Zarafa.plugins.contactimporter.ui.ContextMenu;
+                break;
+        }
 
-		return component;
-	}
+        return component;
+    }
 });
 
 
@@ -299,10 +300,10 @@ Zarafa.plugins.contactimporter.ImportPlugin = Ext.extend(Zarafa.core.Plugin, {
  * STARTUP 
  *############################################################################################################################*/
 Zarafa.onReady(function () {
-	container.registerPlugin(new Zarafa.core.PluginMetaData({
-		name             : 'contactimporter',
-		displayName      : _('Contactimporter Plugin'),
-		about            : Zarafa.plugins.contactimporter.ABOUT,
-		pluginConstructor: Zarafa.plugins.contactimporter.ImportPlugin
-	}));
+    container.registerPlugin(new Zarafa.core.PluginMetaData({
+        name: 'contactimporter',
+        displayName: dgettext('plugin_contactimporter', 'Contactimporter Plugin'),
+        about: Zarafa.plugins.contactimporter.ABOUT,
+        pluginConstructor: Zarafa.plugins.contactimporter.ImportPlugin
+    }));
 });
diff --git a/js/ui/ContextMenu.js b/js/ui/ContextMenu.js
index a289582..6383a2f 100644
--- a/js/ui/ContextMenu.js
+++ b/js/ui/ContextMenu.js
@@ -1,3 +1,25 @@
+/**
+ * ContextMenu.js, Kopano Webapp contact to vcf im/exporter
+ *
+ * Author: Christoph Haas <christoph.h@sprinternet.at>
+ * Copyright (C) 2012-2016 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
+ *
+ */
+
 Ext.namespace('Zarafa.plugins.contactimporter.ui');
 
 /**
@@ -7,130 +29,130 @@ Ext.namespace('Zarafa.plugins.contactimporter.ui');
  */
 Zarafa.plugins.contactimporter.ui.ContextMenu = Ext.extend(Zarafa.hierarchy.ui.ContextMenu, {
 
-	/**
-	 * @constructor
-	 * @param {Object} config Configuration object
-	 */
-	constructor: function (config) {
-		config = config || {};
+    /**
+     * @constructor
+     * @param {Object} config Configuration object
+     */
+    constructor: function (config) {
+        config = config || {};
 
-		if (config.contextNode) {
-			config.contextTree = config.contextNode.getOwnerTree();
-		}
+        if (config.contextNode) {
+            config.contextTree = config.contextNode.getOwnerTree();
+        }
 
-		Zarafa.plugins.contactimporter.ui.ContextMenu.superclass.constructor.call(this, config);
+        Zarafa.plugins.contactimporter.ui.ContextMenu.superclass.constructor.call(this, config);
 
-		// add item to menu
-		var additionalItems = this.createAdditionalContextMenuItems(config);
-		for (var i = 0; i < additionalItems.length; i++) {
-			config.items[0].push(additionalItems[i]);
-		}
+        // add item to menu
+        var additionalItems = this.createAdditionalContextMenuItems(config);
+        for (var i = 0; i < additionalItems.length; i++) {
+            config.items[0].push(additionalItems[i]);
+        }
 
-		Zarafa.plugins.contactimporter.ui.ContextMenu.superclass.constructor.call(this, config); // redo ... otherwise menu does not get published
-	},
+        Zarafa.plugins.contactimporter.ui.ContextMenu.superclass.constructor.call(this, config); // redo ... otherwise menu does not get published
+    },
 
-	/**
-	 * Create the Action context menu items.
-	 * @param {Object} config Configuration object for the {@link Zarafa.plugins.contactimporter.ui.ContextMenu ContextMenu}
-	 * @return {Zarafa.core.ui.menu.ConditionalItem[]} The list of Action context menu items
-	 * @private
-	 *
-	 * Note: All handlers are called within the scope of {@link Zarafa.plugins.contactimporter.ui.ContextMenu HierarchyContextMenu}
-	 */
-	createAdditionalContextMenuItems: function (config) {
-		return [{
-			xtype: 'menuseparator'
-		}, {
-			text      : _('Import vCard'),
-			iconCls   : 'icon_contactimporter_import',
-			handler   : this.onContextItemImport,
-			beforeShow: function (item, record) {
-				var access = record.get('access') & Zarafa.core.mapi.Access.ACCESS_MODIFY;
-				if (!access || (record.isIPMSubTree() && !record.getMAPIStore().isDefaultStore())) {
-					item.setDisabled(true);
-				} else {
-					item.setDisabled(false);
-				}
-			}
-		}, {
-			text      : _('Export vCard'),
-			iconCls   : 'icon_contactimporter_export',
-			handler   : this.onContextItemExport,
-			beforeShow: function (item, record) {
-				var access = record.get('access') & Zarafa.core.mapi.Access.ACCESS_READ;
-				if (!access || (record.isIPMSubTree() && !record.getMAPIStore().isDefaultStore())) {
-					item.setDisabled(true);
-				} else {
-					item.setDisabled(false);
-				}
-			}
-		}];
-	},
+    /**
+     * Create the Action context menu items.
+     * @param {Object} config Configuration object for the {@link Zarafa.plugins.contactimporter.ui.ContextMenu ContextMenu}
+     * @return {Zarafa.core.ui.menu.ConditionalItem[]} The list of Action context menu items
+     * @private
+     *
+     * Note: All handlers are called within the scope of {@link Zarafa.plugins.contactimporter.ui.ContextMenu HierarchyContextMenu}
+     */
+    createAdditionalContextMenuItems: function (config) {
+        return [{
+            xtype: 'menuseparator'
+        }, {
+            text: dgettext('plugin_contactimporter', 'Import vCard'),
+            iconCls: 'icon_contactimporter_import',
+            handler: this.onContextItemImport,
+            beforeShow: function (item, record) {
+                var access = record.get('access') & Zarafa.core.mapi.Access.ACCESS_MODIFY;
+                if (!access || (record.isIPMSubTree() && !record.getMAPIStore().isDefaultStore())) {
+                    item.setDisabled(true);
+                } else {
+                    item.setDisabled(false);
+                }
+            }
+        }, {
+            text: dgettext('plugin_contactimporter', 'Export vCard'),
+            iconCls: 'icon_contactimporter_export',
+            handler: this.onContextItemExport,
+            beforeShow: function (item, record) {
+                var access = record.get('access') & Zarafa.core.mapi.Access.ACCESS_READ;
+                if (!access || (record.isIPMSubTree() && !record.getMAPIStore().isDefaultStore())) {
+                    item.setDisabled(true);
+                } else {
+                    item.setDisabled(false);
+                }
+            }
+        }];
+    },
 
-	/**
-	 * Fires on selecting 'Open' menu option from {@link Zarafa.plugins.contactimporter.ui.ContextMenu ContextMenu}
-	 * @private
-	 */
-	onContextItemExport: function () {
-		var responseHandler = new Zarafa.plugins.contactimporter.data.ResponseHandler({
-			successCallback: this.downloadVCF,
-			scope          : this
-		});
+    /**
+     * Fires on selecting 'Open' menu option from {@link Zarafa.plugins.contactimporter.ui.ContextMenu ContextMenu}
+     * @private
+     */
+    onContextItemExport: function () {
+        var responseHandler = new Zarafa.plugins.contactimporter.data.ResponseHandler({
+            successCallback: this.downloadVCF,
+            scope: this
+        });
 
-		// request attachment preperation
-		container.getRequest().singleRequest(
-			'contactmodule',
-			'export',
-			{
-				storeid: this.records.get("store_entryid"),
-				folder : this.records.get("entryid")
-			},
-			responseHandler
-		);
-	},
+        // request attachment preperation
+        container.getRequest().singleRequest(
+            'contactmodule',
+            'export',
+            {
+                storeid: this.records.get("store_entryid"),
+                folder: this.records.get("entryid")
+            },
+            responseHandler
+        );
+    },
 
-	/**
-	 * Fires on selecting 'Open' menu option from {@link Zarafa.plugins.contactimporter.ui.ContextMenu ContextMenu}
-	 * @private
-	 */
-	onContextItemImport: function () {
-		var componentType = Zarafa.core.data.SharedComponentType['plugins.contactimporter.dialogs.importcontacts'];
-		var config = {
-			modal : true,
-			folder: this.records.get("entryid")
-		};
+    /**
+     * Fires on selecting 'Open' menu option from {@link Zarafa.plugins.contactimporter.ui.ContextMenu ContextMenu}
+     * @private
+     */
+    onContextItemImport: function () {
+        var componentType = Zarafa.core.data.SharedComponentType['plugins.contactimporter.dialogs.importcontacts'];
+        var config = {
+            modal: true,
+            folder: this.records.get("entryid")
+        };
 
-		Zarafa.core.data.UIFactory.openLayerComponent(componentType, undefined, config);
-	},
+        Zarafa.core.data.UIFactory.openLayerComponent(componentType, undefined, config);
+    },
 
-	/**
-	 * Callback for the export request.
-	 * @param {Object} response
-	 */
-	downloadVCF: function (response) {
-		if (response.status == false) {
-			Zarafa.common.dialogs.MessageBox.show({
-				title  : dgettext('plugin_files', 'Warning'),
-				msg    : dgettext('plugin_files', response.message),
-				icon   : Zarafa.common.dialogs.MessageBox.WARNING,
-				buttons: Zarafa.common.dialogs.MessageBox.OK
-			});
-		} else {
-			var downloadFrame = Ext.getBody().createChild({
-				tag: 'iframe',
-				cls: 'x-hidden'
-			});
+    /**
+     * Callback for the export request.
+     * @param {Object} response
+     */
+    downloadVCF: function (response) {
+        if (response.status == false) {
+            Zarafa.common.dialogs.MessageBox.show({
+                title: dgettext('plugin_contactimporter', 'Warning'),
+                msg: response.message,
+                icon: Zarafa.common.dialogs.MessageBox.WARNING,
+                buttons: Zarafa.common.dialogs.MessageBox.OK
+            });
+        } else {
+            var downloadFrame = Ext.getBody().createChild({
+                tag: 'iframe',
+                cls: 'x-hidden'
+            });
 
-			var url = document.URL;
-			var link = url.substring(0, url.lastIndexOf('/') + 1);
+            var url = document.URL;
+            var link = url.substring(0, url.lastIndexOf('/') + 1);
 
-			link += "index.php?sessionid=" + container.getUser().getSessionId() + "&load=custom&name=download_vcf";
-			link = Ext.urlAppend(link, "token=" + encodeURIComponent(response.download_token));
-			link = Ext.urlAppend(link, "filename=" + encodeURIComponent(response.filename));
+            link += "index.php?sessionid=" + container.getUser().getSessionId() + "&load=custom&name=download_vcf";
+            link = Ext.urlAppend(link, "token=" + encodeURIComponent(response.download_token));
+            link = Ext.urlAppend(link, "filename=" + encodeURIComponent(response.filename));
 
-			downloadFrame.dom.contentWindow.location = link;
-		}
-	}
+            downloadFrame.dom.contentWindow.location = link;
+        }
+    }
 });
 
 Ext.reg('contactimporter.hierarchycontextmenu', Zarafa.plugins.contactimporter.ui.ContextMenu);
diff --git a/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.mo b/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.mo
index ab0296d..3753ba0 100644
Binary files a/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.mo and b/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.mo differ
diff --git a/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.po b/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.po
index 9711b7c..b083f50 100644
--- a/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.po
+++ b/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plugin Contactimporter\n"
-"POT-Creation-Date: 2016-11-29 15:23+0100\n"
-"PO-Revision-Date: 2016-11-29 15:23+0100\n"
+"POT-Creation-Date: 2016-11-29 15:47+0100\n"
+"PO-Revision-Date: 2016-11-29 15:47+0100\n"
 "Last-Translator: \n"
 "Language-Team: Christoph Haas <christoph.h@sprinternet.at>\n"
 "Language: en_US\n"
@@ -10,41 +10,163 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.7.1\n"
-"X-Poedit-Basepath: ../../../php\n"
+"X-Poedit-Basepath: ../../..\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-SearchPath-0: .\n"
-"X-Poedit-SearchPath-1: vendor\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-SearchPath-0: php\n"
+"X-Poedit-SearchPath-1: js\n"
 
-#: module.contact.php:245
+#: js/dialogs/ImportContentPanel.js:45
+msgid "Import Contacts"
+msgstr "Import Contacts"
+
+#: js/dialogs/ImportPanel.js:98
+msgid "Loading..."
+msgstr "Loading..."
+
+#: js/dialogs/ImportPanel.js:290
+msgid "Select contacts to import"
+msgstr "Select contacts to import"
+
+#: js/dialogs/ImportPanel.js:301
+msgid "Displayname"
+msgstr "Displayname"
+
+#: js/dialogs/ImportPanel.js:302
+msgid "Firstname"
+msgstr "Firstname"
+
+#: js/dialogs/ImportPanel.js:303
+msgid "Lastname"
+msgstr "Lastname"
+
+#: js/dialogs/ImportPanel.js:304
+msgid "Company"
+msgstr "Company"
+
+#: js/dialogs/ImportPanel.js:325
+msgid "Select folder"
+msgstr "Select folder"
+
+#: js/dialogs/ImportPanel.js:348
+msgid "Select an .vcf addressbook"
+msgstr "Select an .vcf addressbook"
+
+#: js/dialogs/ImportPanel.js:372
+msgid "Import"
+msgstr "Import"
+
+#: js/dialogs/ImportPanel.js:391
+msgid "Import All"
+msgstr "Import All"
+
+#: js/dialogs/ImportPanel.js:408
+msgid "Cancel"
+msgstr "Cancel"
+
+#: js/dialogs/ImportPanel.js:426
+msgid "Uploading and parsing contacts..."
+msgstr "Uploading and parsing contacts..."
+
+#: js/dialogs/ImportPanel.js:432 js/dialogs/ImportPanel.js:531
+#: js/dialogs/ImportPanel.js:539 js/dialogs/ImportPanel.js:586
+#: js/plugin.contactimporter.js:164
+msgid "Error"
+msgstr "Error"
+
+#: js/dialogs/ImportPanel.js:487
+msgid "Parser Error"
+msgstr "Parser Error"
+
+#: js/dialogs/ImportPanel.js:532
+msgid "You have to choose an addressbook!"
+msgstr "You have to choose an addressbook!"
+
+#: js/dialogs/ImportPanel.js:540
+msgid "You have to choose at least one contact to import!"
+msgstr "You have to choose at least one contact to import!"
+
+#. TRANSLATORS: {0} will be replaced by the number of contacts that were imported
+#: js/dialogs/ImportPanel.js:583
+msgid "Imported"
+msgstr "Imported"
+
+#: js/dialogs/ImportPanel.js:583
+msgid "Imported {0} contacts. Please reload your addressbook!"
+msgstr "Imported {0} contacts. Please reload your addressbook!"
+
+#. TRANSLATORS: {0} will be replaced by the error message
+#: js/dialogs/ImportPanel.js:588
+msgid "Import failed: {0}"
+msgstr "Import failed: {0}"
+
+#: js/plugin.contactimporter.js:64 js/ui/ContextMenu.js:78
+msgid "Export vCard"
+msgstr "Export vCard"
+
+#: js/plugin.contactimporter.js:110 js/ui/ContextMenu.js:135
+msgid "Warning"
+msgstr "Warning"
+
+#: js/plugin.contactimporter.js:139
+msgid "Import to Contacts"
+msgstr "Import to Contacts"
+
+#: js/plugin.contactimporter.js:178
+msgid "Please wait"
+msgstr "Please wait"
+
+#: js/plugin.contactimporter.js:179
+msgid "Loading attachment..."
+msgstr "Loading attachment..."
+
+#: js/plugin.contactimporter.js:180
+msgid "Initializing..."
+msgstr "Initializing..."
+
+#. TRANSLATORS: {0} will be replaced by the percentage value (0-100)
+#: js/plugin.contactimporter.js:193
+msgid "{0}% loaded"
+msgstr "{0}% loaded"
+
+#: js/plugin.contactimporter.js:305
+msgid "Contactimporter Plugin"
+msgstr "Contactimporter Plugin"
+
+#: js/ui/ContextMenu.js:66
+msgid "Import vCard"
+msgstr "Import vCard"
+
+#: php/module.contact.php:245
 msgid "VCF file is empty!"
 msgstr "VCF file is empty!"
 
 #. TRANSLATORS: Filename suffix for exported files
-#: module.contact.php:448
+#: php/module.contact.php:448
 msgid "_contacts.vcf"
 msgstr "_contacts.vcf"
 
-#: module.contact.php:451
+#: php/module.contact.php:451
 msgid "No contacts found. Export skipped!"
 msgstr "No contacts found. Export skipped!"
 
-#: module.contact.php:728
+#: php/module.contact.php:728
 msgid "No contacts in vcf file"
 msgstr "No contacts in vcf file"
 
-#: module.contact.php:739
+#: php/module.contact.php:739
 msgid "File could not be read by server"
 msgstr "File could not be read by server"
 
-#: module.contact.php:1141
+#: php/module.contact.php:1141
 msgid "Store could not be opened!"
 msgstr "Store could not be opened!"
 
-#: module.contact.php:1147
+#: php/module.contact.php:1147
 msgid "Wrong call, store and entryid have to be set!"
 msgstr "Wrong call, store and entryid have to be set!"
 
-#: upload.php:69
+#: php/upload.php:69
 msgid ""
 "File could not be moved to TMP path! Check plugin config and folder "
 "permissions!"
@@ -52,6 +174,6 @@ msgstr ""
 "File could not be moved to TMP path! Check plugin config and folder "
 "permissions!"
 
-#: upload.php:72
+#: php/upload.php:72
 msgid "File could not be read by server, upload error!"
 msgstr "File could not be read by server, upload error!"
diff --git a/php/upload.php b/php/upload.php
index 314b577..ab9facb 100644
--- a/php/upload.php
+++ b/php/upload.php
@@ -70,5 +70,4 @@ if (is_readable($_FILES['vcfdata']['tmp_name'])) {
     }
 } else {
     respondJSON(array('success' => false, 'error' => dgettext("plugin_contactimporter", "File could not be read by server, upload error!")));
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file