diff --git a/plugins/nextcloud/js/composer.js b/plugins/nextcloud/js/composer.js
index f82c43cf8..45068cac5 100644
--- a/plugins/nextcloud/js/composer.js
+++ b/plugins/nextcloud/js/composer.js
@@ -43,8 +43,8 @@
 	let template = document.getElementById('PopupsCompose');
 	const uploadBtn = template.content.querySelector('#composeUploadButton');
 	if (uploadBtn) {
-		uploadBtn.after(Element.fromHTML('<a class="btn fontastic"'
-			+ ' data-bind="click: nextcloudAttach" data-i18n="[title]NEXTCLOUD/ATTACH_FILES">◦◯◦</a>'));
+		uploadBtn.after(Element.fromHTML(`<a class="btn fontastic" data-bind="click: nextcloudAttach"
+			data-i18n="[title]NEXTCLOUD/ATTACH_FILES">◦◯◦</a>`));
 	}
 
 /**
diff --git a/plugins/nextcloud/js/message.js b/plugins/nextcloud/js/message.js
index 3d5eb8be9..2652a91c8 100644
--- a/plugins/nextcloud/js/message.js
+++ b/plugins/nextcloud/js/message.js
@@ -69,18 +69,12 @@
 
 			view.nextcloudSaveICS = () => {
 				let attachment = view.nextcloudICS();
-				attachment && rl.nextcloud.selectCalendar().then(href => {
-					if (href) {
-						fetch(attachment.linkDownload(), {
-							mode: 'same-origin',
-							cache: 'no-cache',
-							redirect: 'error',
-							credentials: 'same-origin'
-						})
-						.then(response => (response.status < 400) ? response.text() : Promise.reject(new Error({ response })))
-						.then(text => rl.nextcloud.calendarPut(href, text));
-					}
-				});
+				attachment && rl.nextcloud.selectCalendar()
+				.then(href =>
+					href && rl.fetch(attachment.linkDownload())
+					.then(response => (response.status < 400) ? response.text() : Promise.reject(new Error({ response })))
+					.then(text => rl.nextcloud.calendarPut(href, text))
+				);
 			}
 		}
 	});
@@ -89,26 +83,27 @@
 
 	const attachmentsControls = template.content.querySelector('.attachmentsControls');
 	if (attachmentsControls) {
-		attachmentsControls.append(Element.fromHTML('<span>'
-			+ '<i class="fontastic iconcolor-red" data-bind="visible: saveNextcloudError">✖</i>'
-			+ '<i class="fontastic" data-bind="visible: !saveNextcloudError(), css: {\'icon-spinner\': saveNextcloudLoading()}">💾</i>'
-			+ '<span class="g-ui-link" data-bind="click: saveNextcloud" data-i18n="NEXTCLOUD/SAVE_ATTACHMENTS"></span>'
-		+ '</span>'));
+		attachmentsControls.append(Element.fromHTML(`<span>
+			<i class="fontastic iconcolor-red" data-bind="visible: saveNextcloudError">✖</i>
+			<i class="fontastic" data-bind="visible: !saveNextcloudError(),
+				css: {'icon-spinner': saveNextcloudLoading()}">💾</i>
+			<span class="g-ui-link" data-bind="click: saveNextcloud" data-i18n="NEXTCLOUD/SAVE_ATTACHMENTS"></span>
+		</span>`));
 
 		// https://github.com/nextcloud/calendar/issues/4684
 		let cfg = rl.settings.get('Nextcloud');
 		if (cfg.CalDAV) {
-			attachmentsControls.append(Element.fromHTML('<span data-bind="visible: nextcloudICS" data-icon="📅">'
-				+ '<span class="g-ui-link" data-bind="click: nextcloudSaveICS" data-i18n="NEXTCLOUD/SAVE_ICS"></span>'
-			+ '</span>'));
+			attachmentsControls.append(Element.fromHTML(`<span data-bind="visible: nextcloudICS" data-icon="📅">
+				<span class="g-ui-link" data-bind="click: nextcloudSaveICS" data-i18n="NEXTCLOUD/SAVE_ICS"></span>
+			</span>`));
 		}
 	}
 
 	const msgMenu = template.content.querySelector('#more-view-dropdown-id + menu');
 	if (msgMenu) {
-		msgMenu.append(Element.fromHTML('<li role="presentation">'
-			+ '<a href="#" tabindex="-1" data-icon="📥" data-bind="click: nextcloudSaveMsg" data-i18n="NEXTCLOUD/SAVE_EML"></a>'
-		+ '</li>'));
+		msgMenu.append(Element.fromHTML(`<li role="presentation">
+			<a href="#" tabindex="-1" data-icon="📥" data-bind="click: nextcloudSaveMsg" data-i18n="NEXTCLOUD/SAVE_EML"></a>
+		</li>`));
 	}
 
 })(window.rl);
diff --git a/plugins/nextcloud/js/messagelist.js b/plugins/nextcloud/js/messagelist.js
index 398b40c78..13feda12d 100644
--- a/plugins/nextcloud/js/messagelist.js
+++ b/plugins/nextcloud/js/messagelist.js
@@ -32,9 +32,9 @@
 
 	const msgMenu = template.content.querySelector('#more-list-dropdown-id + menu [data-bind*="forwardCommand"]');
 	if (msgMenu) {
-		msgMenu.after(Element.fromHTML('<li role="presentation" data-bind="css:{disabled:!messageList.hasChecked()}">'
-			+ '<a href="#" tabindex="-1" data-icon="📥" data-bind="click: nextcloudSaveMsgs" data-i18n="NEXTCLOUD/SAVE_EML"></a>'
-		+ '</li>'));
+		msgMenu.after(Element.fromHTML(`<li role="presentation" data-bind="css:{disabled:!messageList.hasChecked()}">
+			<a href="#" tabindex="-1" data-icon="📥" data-bind="click: nextcloudSaveMsgs" data-i18n="NEXTCLOUD/SAVE_EML"></a>
+		</li>`));
 	}
 
 })(window.rl);