diff --git a/apps/calendar/ajax/importdialog.php b/apps/calendar/ajax/importdialog.php
index 983a3d95a8..f6b8453fc2 100644
--- a/apps/calendar/ajax/importdialog.php
+++ b/apps/calendar/ajax/importdialog.php
@@ -1,20 +1,17 @@
 <?php
 /**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
  */
 
 require_once('../../../lib/base.php');
-
+OC_JSON::checkLoggedIn();
+OC_Util::checkAppEnabled('calendar');
 $l10n = new OC_L10N('calendar');
-
-if(!OC_USER::isLoggedIn()) {
-	die('<script type="text/javascript">document.location = oc_webroot;</script>');
-}
-OC_JSON::checkAppEnabled('calendar');
-
 $tmpl = new OC_Template('calendar', 'part.import');
+$tmpl->assign('path', $_POST['path']);
+$tmpl->assign('filename', $_POST['filename']);
 $tmpl->printpage();
 ?>
diff --git a/apps/calendar/import.php b/apps/calendar/import.php
index 759726b8d1..d1186e691e 100644
--- a/apps/calendar/import.php
+++ b/apps/calendar/import.php
@@ -1,46 +1,122 @@
 <?php
 /**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
  */
-
+//check for calendar rights or create new one
+ob_start();
 require_once ('../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_Util::checkAppEnabled('calendar');
-
-if($_GET["import"] == "existing"){
-	$calid = $_GET["calid"];
-	$calendar = OC_Calendar_App::getCalendar($calid);
-	if($_GET["path"] != ""){
-		$filename = $_GET["path"] . "/" . $_GET["file"];
-	}else{
-		$filename = "/" . $_GET["file"];
-	}
-}else{
+$progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '10');
+	fclose($progressfopen);
+}
+$file = OC_Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']);
+if($_POST['method'] == 'new'){
 	$id = OC_Calendar_Calendar::addCalendar(OC_User::getUser(), $_POST['calname']);
 	OC_Calendar_Calendar::setCalendarActive($id, 1);
-	$calid = $id;
-	if($_POST["path"] != ""){
-		$filename = $_POST["path"] . "/" . $_POST["file"];
+}else{
+	$calendar = OC_Calendar_App::getCalendar($_POST['id']);
+	if($calendar['userid'] != OC_USER::getUser()){
+		OC_JSON::error();
+		exit();
+	}
+	$id = $_POST['id'];
+}
+//analyse the calendar file
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '20');
+	fclose($progressfopen);
+}
+$searchfor = array('VEVENT', 'VTODO', 'VJOURNAL');
+$parts = $searchfor;
+$filearr = explode('
+', $file);
+$inelement = false;
+$parts = array();
+$i = 0;
+foreach($filearr as $line){
+	foreach($searchfor as $search){
+		if(substr_count($line, $search) == 1){
+			list($attr, $val) = explode(':', $line);
+			if($attr == 'BEGIN'){
+				$parts[]['begin'] = $i;
+				$inelement = true;
+			}
+			if($attr == 'END'){
+				$parts[count($parts) - 1]['end'] = $i;
+				$inelement = false;
+			}
+		}
+	}
+	$i++;
+}
+//import the calendar
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '40');
+	fclose($progressfopen);
+}
+$start = '';
+$nl = '
+';
+for ($i = 0; $i < $parts[0]['begin']; $i++) { 
+	if($i == 0){
+		$start = $filearr[0];
 	}else{
-		$filename = "/" . $_POST["file"];
+		$start .= $nl . $filearr[$i];
 	}
 }
-$vcalendar = OC_Filesystem::file_get_contents($filename);
-$vcalendar = explode("BEGIN:VEVENT", $vcalendar);
-for($i = 1;$i < count($vcalendar);$i++){
-	$vcalendar[$i] = "BEGIN:VEVENT" . $vcalendar[$i];
+$end = '';
+for($i = $parts[count($parts) - 1]['end'] + 1;$i <= count($filearr) - 1; $i++){
+	if($i == $parts[count($parts) - 1]['end'] + 1){
+		$end = $filearr[$parts[count($parts) - 1]['end'] + 1];
+	}else{
+		$end .= $nl . $filearr[$i];
+	}
 }
-for($i = 1;$i < count($vcalendar) - 1;$i++){
-	$vcalendar[$i] = $vcalendar[$i] . "END:VCALENDAR";
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '50');
+	fclose($progressfopen);
 }
-for($i = 1;$i < count($vcalendar);$i++){
-	$vcalendar[$i] = $vcalendar[0] . $vcalendar[$i];
+$importready = array();
+foreach($parts as $part){
+	for($i = $part['begin']; $i <= $part['end'];$i++){
+		if($i == $part['begin']){
+			$content = $filearr[$i];
+		}else{
+			$content .= $nl . $filearr[$i];
+		}
+	}
+	$importready[] = $start . $nl . $content . $nl . $end;
 }
-for($i = 1;$i < count($vcalendar);$i++){
-	OC_Calendar_Object::add($calid, $vcalendar[$i]);
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '70');
+	fclose($progressfopen);
 }
-OC_JSON::success();
-?>
+if(count($parts) == 1){
+	OC_Calendar_Object::add($id, $file);
+}else{
+	foreach($importready as $import){
+		OC_Calendar_Object::add($id, $import);
+	}
+}
+//done the import
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '100');
+	fclose($progressfopen);
+}
+sleep(3);
+if(is_writable('import_tmp/')){
+	unlink($progressfile);
+}
+OC_JSON::success();
\ No newline at end of file
diff --git a/apps/calendar/import_tmp/Info b/apps/calendar/import_tmp/Info
new file mode 100644
index 0000000000..abafbce435
--- /dev/null
+++ b/apps/calendar/import_tmp/Info
@@ -0,0 +1,2 @@
+This folder contains static files with the percentage of the import.
+Requires write permission
diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
index 50a7b082d9..4e483f9864 100644
--- a/apps/calendar/js/loader.js
+++ b/apps/calendar/js/loader.js
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
 Calendar_Import={
 	importdialog: function(filename){
 		var path = $('#dir').val();
@@ -5,23 +11,31 @@ Calendar_Import={
 		$('#calendar_import').load(OC.filePath('calendar', 'ajax', 'importdialog.php'), {filename:filename, path:path},	function(){Calendar_Import.initdialog(filename);});
 	},
 	initdialog: function(filename){
-		$("#calendar_import_dialog").dialog({
+		$('#calendar_import_dialog').dialog({
 			width : 500,
 			close : function() {
 				$(this).dialog('destroy').remove();
-				$("#calendar_import").remove();
+				$('#calendar_import').remove();
 			}
 		});
-		$('#progressbar').progressbar({value: 87});
+		$('#import_done_button').click(function(){
+			$('#calendar_import_dialog').dialog('destroy').remove();
+			$('#calendar_import').remove();
+		});
+		$('#progressbar').progressbar({value: 0});
 		$('#startimport').click(function(){
 			var filename = $('#filename').val();
 			var path = $('#path').val();
+			var calid = $('#calendar option:selected').val();
 			if($('#calendar option:selected').val() == 'newcal'){
 				var method = 'new';
 				var calname = $('#newcalendar').val();
 				var calname = $.trim(calname);
 				if(calname == ''){
 					$('#newcalendar').css('background-color', '#FF2626');
+					$('#newcalendar').focus(function(){
+						$('#newcalendar').css('background-color', '#F8F8F8');
+					});
 					return false;
 				}
 			}else{
@@ -29,8 +43,16 @@ Calendar_Import={
 			}
 			$('#newcalendar').attr('readonly', 'readonly');
 			$('#calendar').attr('disabled', 'disabled');
-			$.post(OC.filePath('calendar', '', 'import.php'), {'method':method, 'calname':calname, 'path':path, 'file':filename}, function(){});
-			$('#progressbar').slideDown('slow');
+			var progressfile = $('#progressfile').val();
+			$.post(OC.filePath('calendar', '', 'import.php'), {method: String (method), calname: String (calname), path: String (path), file: String (filename), id: String (calid)}, function(data){
+				if(data.status == 'success'){
+					$('#progressbar').progressbar('option', 'value', 100);
+					$('#import_done').css('display', 'block');
+				}
+			});
+			$('#form_container').css('display', 'none');
+			$('#progressbar_container').css('display', 'block');
+			window.setTimeout('Calendar_Import.getimportstatus(\'' + progressfile + '\')', 500);
 		});
 		$('#calendar').change(function(){
 			if($('#calendar option:selected').val() == 'newcal'){
@@ -40,8 +62,15 @@ Calendar_Import={
 			}
 		});
 	},
-	getimportstatus: function(){
-		
+	getimportstatus: function(progressfile){
+		$.get(OC.filePath('calendar', 'import_tmp', progressfile), function(percent){
+			$('#progressbar').progressbar('option', 'value', parseInt(percent));
+			if(percent < 100){
+				window.setTimeout('Calendar_Import.getimportstatus(\'' + progressfile + '\')', 500);
+			}else{
+				$('#import_done').css('display', 'block');
+			}
+		});
 	}
 }
 $(document).ready(function(){
diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php
index 13685cfb27..8f46484b42 100644
--- a/apps/calendar/templates/part.import.php
+++ b/apps/calendar/templates/part.import.php
@@ -1,7 +1,9 @@
 <div id="calendar_import_dialog" title="<?php echo $l->t("Import a calendar file"); ?>">
-<input type="hidden" id="filename" value="<?php echo $_GET["filename"];?>">
-<input type="hidden" id="path" value="<?php echo $_GET["path"];?>">
-<p style="text-align:center;"><b><?php echo $l->t('Please choose the calendar'); ?></b></h2>
+<div id="form_container">
+<input type="hidden" id="filename" value="<?php echo $_['filename'];?>">
+<input type="hidden" id="path" value="<?php echo $_['path'];?>">
+<input type="hidden" id="progressfile" value="<?php echo md5(session_id()) . '.txt';?>">
+<p style="text-align:center;"><b><?php echo $l->t('Please choose the calendar'); ?></b>
 <select style="width:100%;" id="calendar" name="calendar">
 <?php
 $calendar_options = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
@@ -13,6 +15,13 @@ echo html_select_options($calendar_options, $calendar_options[0]['id'], array('v
 	<input type="text" style="width: 97%;" placeholder="<?php echo $l->t('Name of new calendar'); ?>" id="newcalendar" name="newcalendar">
 </div>
 <input type="button" value="<?php echo $l->t("Import");?>!" id="startimport">
-<br><br>
-<div id="progressbar" style="display: none;"></div>
+</div>
+<div id="progressbar_container" style="display: none">
+<p style="text-align:center;"><b><?php echo $l->t('Importing calendar'); ?></b>
+<div id="progressbar"></div>
+<div id="import_done" style="display: none;">
+<p style="text-align:center;"><b><?php echo $l->t('Calendar imported successfully'); ?></b></p>
+<input type="button" value="<?php echo $l->t('Close Dialog'); ?>" id="import_done_button">
+</div>
+</div>
 </div>
\ No newline at end of file