2 files changed, 11 insertions, 17 deletions

diff --git a/lib/Controller/MessagesController.php b/lib/Controller/MessagesController.php
index 32a87956a..2e949df28 100755
--- a/lib/Controller/MessagesController.php
+++ b/lib/Controller/MessagesController.php
@@ -443,7 +443,7 @@ class MessagesController extends Controller {
 	 * @return boolean
 	 */
 	private function attachmentIsCalendarEvent(array $attachment): bool {
-		return $attachment['mime'] === 'text/calendar';
+		return in_array($attachment['mime'],  ['text/calendar', 'application/ics'], true);
 	}
 
 }
diff --git a/src/service/DAVService.js b/src/service/DAVService.js
index 9d0de2237..10eba7faa 100644
--- a/src/service/DAVService.js
+++ b/src/service/DAVService.js
@@ -101,12 +101,10 @@ const getCalendarData = properties => {
 export const getUserCalendars = () => {
 	var url = generateRemoteUrl('dav/calendars') + '/' + getCurrentUser().uid + '/'
 
-	return getRequestToken()
-		.then(token =>
-			client.propFind(url, props, 1, {
-				requesttoken: token,
-			})
-		)
+	return client
+		.propFind(url, props, 1, {
+			requesttoken: getRequestToken(),
+		})
 		.then(data => {
 			const calendars = []
 
@@ -172,7 +170,7 @@ const splitCalendar = data => {
 		for (let objectsId in allObjects[componentName]) {
 			const objects = allObjects[componentName][objectsId]
 			const component = createICalElement()
-			timezones.forEach(component.addSubcomponent)
+			timezones.forEach(component.addSubcomponent.bind(component))
 			for (let objectId in objects) {
 				component.addSubcomponent(objects[objectId])
 			}
@@ -206,15 +204,11 @@ export const importCalendarEvent = url => data => {
 			const component = file.split[componentName][componentId]
 			promises.push(
 				Promise.resolve(
-					Axios.put(
-						url + getRandomString(),
-						{data},
-						{
-							headers: {
-								contentType: 'text/calendar; charset=utf-8',
-							},
-						}
-					)
+					Axios.put(url + getRandomString() + '.ics', component, {
+						headers: {
+							'Content-Type': 'text/calendar; charset=utf-8',
+						},
+					})
 				)
 			)
 		}