diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
index 6eafec8b10d..c21c20275e2 100644
--- a/apps/calendar/js/loader.js
+++ b/apps/calendar/js/loader.js
@@ -1,16 +1,19 @@
-function importdialog(directory, filename){
-	$("body").append("<div id=\"importdialogholder\"></div>");
-	$("#importdialogholder").load(OC.filePath('calendar', 'ajax', 'importdialog.php?filename=' + filename + '&path=' + directory));
-}
-
-$(document).ready(function(){
-	$('tr[data-file$=".ics"]').attr("data-mime", "text/calendar");
-	$('tr[data-file$=".vcs"]').attr("data-mime", "text/calendar");
-	$('tr[data-file$=".ical"]').attr("data-mime", "text/calendar");
-	if(typeof FileActions!=='undefined'){
-		FileActions.register('text/calendar','Import to Calendar','',function(filename){
-			importdialog($('#dir').val(),filename);
-		});
-		FileActions.setDefault('text/calendar','Import to Calendar');
+Calendar_Import={
+	importdialog: function(filename){
+		var path = $('#dir').val();
+		$('body').append('<div id="calendar_import"></div>');
+		$('#calendar_import').load(OC.filePath('calendar', 'ajax', 'importdialog.php'), {filename:filename, path:path},	Calendar_Import.initdialog());
+	},
+	initdialog: function(){
+		
+	},
+	getimportstatus: function(){
+		
 	}
+}
+$(document).ready(function(){
+	if(typeof FileActions !== 'undefined'){
+		FileActions.register('text/calendar','importcal', '', Calendar_Import.importdialog); 
+		FileActions.setDefault('text/calendar','importcal');
+	};
 });
\ No newline at end of file