diff --git a/calendar/src/store/calendarObjects.js b/calendar/src/store/calendarObjects.js
index c2ec0de..448c2aa 100644
--- a/calendar/src/store/calendarObjects.js
+++ b/calendar/src/store/calendarObjects.js
@@ -321,13 +321,20 @@ const actions = {
 			return
 			// TODO - catch conflicts
 		}
+
 		const calendar = context.getters.getCalendarById(calendarObject.calendarId)
 		let icsValue = calendarObject.calendarComponent.toICS();
 		if(eventComponent != null){
+			let foldedComment = ""
+			if(eventComponent.comment != null) {
+				const escapedComment = escapeICSField(eventComponent.comment)
+				foldedComment = foldICSLines(escapedComment)
+			}
+
 			const customKeyValue = {
 				"CLIENT": eventComponent.client, 
 				"EMBALMER": eventComponent.embalmer, 
-				"COMMENT": eventComponent.comment,
+				"COMMENT": foldedComment,
 				"ISPRIVATE": eventComponent.isPrivate ? "1" : "0",
 				"ISCALENDARPENDING": eventComponent.isCalendarPending ? "1" : "0",
 				"ABSENCETYPE": eventComponent.absenceType ?? ''