diff --git a/package-lock.json b/package-lock.json
index d2e243efbc..0d24989e53 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5930,11 +5930,18 @@
 			"dev": true
 		},
 		"cdav-library": {
-			"version": "git+https://github.com/nextcloud/cdav-library.git#c4f7d8225c2c8cfa5a3d269b3d986698d257dd5d",
+			"version": "git+https://github.com/nextcloud/cdav-library.git#7fdc09ccc4917635c5189a878be9a899ee81f799",
 			"from": "git+https://github.com/nextcloud/cdav-library.git",
 			"requires": {
-				"core-js": "^3.12.1",
+				"core-js": "^3.13.0",
 				"regenerator-runtime": "^0.13.7"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "3.13.1",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.13.1.tgz",
+					"integrity": "sha512-JqveUc4igkqwStL2RTRn/EPFGBOfEZHxJl/8ej1mXJR75V3go2mFF4bmUYkEIT1rveHKnkUlcJX/c+f1TyIovQ=="
+				}
 			}
 		},
 		"chalk": {
diff --git a/src/components/AppNavigation/AppNavigationHeader/AppNavigationHeaderDatePicker.vue b/src/components/AppNavigation/AppNavigationHeader/AppNavigationHeaderDatePicker.vue
index eeaff526e6..44f0f02fb5 100644
--- a/src/components/AppNavigation/AppNavigationHeader/AppNavigationHeaderDatePicker.vue
+++ b/src/components/AppNavigation/AppNavigationHeader/AppNavigationHeaderDatePicker.vue
@@ -83,7 +83,7 @@ export default {
 			locale: (state) => state.settings.momentLocale,
 		}),
 		selectedDate() {
-			return getDateFromFirstdayParam(this.$route.params.firstDay)
+			return getDateFromFirstdayParam(this.$route.params?.firstDay ?? 'now')
 		},
 		previousShortKeyConf() {
 			return {
diff --git a/src/components/AppNavigation/CalendarList/Moment.vue b/src/components/AppNavigation/CalendarList/Moment.vue
new file mode 100644
index 0000000000..960edf8ebb
--- /dev/null
+++ b/src/components/AppNavigation/CalendarList/Moment.vue
@@ -0,0 +1,29 @@
+<template>
+	<span class="live-relative-timestamp" :data-timestamp="timestamp * 1000" :title="title">{{ formatted }}</span>
+</template>
+
+<script>
+import moment from '@nextcloud/moment'
+
+export default {
+	name: 'Moment',
+	props: {
+		timestamp: {
+			type: Number,
+			required: true,
+		},
+		format: {
+			type: String,
+			default: 'LLL',
+		},
+	},
+	computed: {
+		title() {
+			return moment.unix(this.timestamp).format(this.format)
+		},
+		formatted() {
+			return moment.unix(this.timestamp).fromNow()
+		},
+	},
+}
+</script>
diff --git a/src/components/AppNavigation/CalendarList/Trashbin.vue b/src/components/AppNavigation/CalendarList/Trashbin.vue
new file mode 100644
index 0000000000..7e052867cd
--- /dev/null
+++ b/src/components/AppNavigation/CalendarList/Trashbin.vue
@@ -0,0 +1,180 @@
+<!--
+  - @copyright 2021 Christoph Wurst <christoph@winzerhof-wurst.at>
+  -
+  - @author 2021 Christoph Wurst <christoph@winzerhof-wurst.at>
+  -
+  - @license GNU AGPL version 3 or any later version
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<template>
+	<AppNavigationItem :title="t('calendar', 'Trashbin')"
+		:pinned="true"
+		icon="icon-delete"
+		@click.prevent="onShow">
+		<template #extra>
+			<Modal v-if="showModal"
+				@close="showModal = false">
+				<div class="modal__content">
+					<h2>{{ t('calendar', 'Trashbin') }}</h2>
+					<span v-if="!items.length">{{ t('calendar', 'You do not have any deleted calendars or events') }}</span>
+					<table v-else>
+						<tr>
+							<th>{{ t('calendar', 'Name') }}</th>
+							<th class="deletedAt">
+								{{ t('calendar', 'Deleted at') }}
+							</th>
+							<th>&nbsp;</th>
+						</tr>
+						<tr v-for="item in items" :key="item.url">
+							<td>{{ item.name }}</td>
+							<td class="deletedAt">
+								<Moment class="timestamp" :timestamp="item.deletedAt" />
+							</td>
+							<td>
+								<button @click="restore(item)">
+									restore
+								</button>
+							</td>
+						</tr>
+					</table>
+				</div>
+			</Modal>
+		</template>
+	</AppNavigationItem>
+</template>
+
+<script>
+import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
+import Modal from '@nextcloud/vue/dist/Components/Modal'
+import logger from '../../../utils/logger'
+import { showError } from '@nextcloud/dialogs'
+import { mapGetters } from 'vuex'
+import Moment from './Moment'
+
+export default {
+	name: 'Trashbin',
+	components: {
+		AppNavigationItem,
+		Modal,
+		Moment,
+	},
+	data() {
+		return {
+			showModal: false,
+		}
+	},
+	computed: {
+		...mapGetters([
+			'trashBin',
+		]),
+		calendars() {
+			return this.$store.getters.sortedDeletedCalendars
+		},
+		objects() {
+			return this.$store.getters.deletedCalendarObjects
+		},
+		items() {
+			const formattedCalendars = this.calendars.map(calendar => ({
+				calendar,
+				type: 'calendar',
+				key: calendar.url,
+				name: calendar.displayname,
+				url: calendar._url,
+				deletedAt: calendar._props['{http://nextcloud.com/ns}deleted-at'],
+			}))
+			const formattedCalendarObjects = this.objects.map(vobject => {
+				let eventSummary = t('calendar', 'Untitled event')
+				try {
+					// TODO: there _has to be_ a less error prone way …
+					eventSummary = vobject.calendarComponent?._components?.get('VEVENT')[0]?._properties?.get('SUMMARY')[0]?.value
+				} catch (e) {
+					// ignore
+				}
+				return {
+					vobject,
+					type: 'object',
+					key: vobject.id,
+					name: `${eventSummary} (${vobject.calendar.displayName})`,
+					url: vobject.uri,
+					deletedAt: vobject.dav._props['{http://nextcloud.com/ns}deleted-at'],
+				}
+			})
+
+			return formattedCalendars.concat(formattedCalendarObjects)
+		},
+	},
+	methods: {
+		async onShow() {
+			this.showModal = true
+
+			try {
+				await Promise.all([
+					this.$store.dispatch('loadDeletedCalendars'),
+					this.$store.dispatch('loadDeletedCalendarObjects'),
+				])
+
+				logger.debug('deleted calendars loaded', {
+					calendars: this.calendars,
+					objects: this.objects,
+				})
+			} catch (error) {
+				logger.error('could not load deleted calendars and objects', {
+					error,
+				})
+
+				showError(t('calendar', 'Could not load deleted calendars and objects'))
+			}
+		},
+		async restore(item) {
+			logger.debug('restoring ' + item.url, item)
+			try {
+				switch (item.type) {
+				case 'calendar':
+					await this.$store.dispatch('restoreCalendar', { calendar: item.calendar })
+					this.$store.dispatch('loadCollections')
+					break
+				case 'object':
+					await this.$store.dispatch('restoreCalendarObject', { vobject: item.vobject })
+					break
+				}
+			} catch (error) {
+				logger.error('could not restore ' + item.url, { error })
+
+				showError(t('calendar', 'Could not restore calendar or event'))
+			}
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+.modal__content {
+	width: 40vw;
+	margin: 2vw;
+}
+table {
+	width: 100%;
+}
+th, td {
+	padding: 4px;
+}
+th {
+	font-weight: bold;
+}
+.deletedAt {
+	text-align: right;
+}
+</style>
diff --git a/src/services/caldavService.js b/src/services/caldavService.js
index df271ff5c1..f1f445a53c 100644
--- a/src/services/caldavService.js
+++ b/src/services/caldavService.js
@@ -75,10 +75,30 @@ const initializeClientForPublicView = async() => {
 /**
  * Fetch all calendars from the server
  *
+ * @returns {Promise<CalendarHome>}
+ */
+const getCalendarHome = () => getClient().calendarHomes[0]
+
+/**
+ * Fetch all collections in the calendar home from the server
+ *
+ * @returns {Promise<Collection[]>}
+ */
+const findAll = () => {
+	return getCalendarHome().findAllCalDAVCollectionsGrouped()
+}
+
+/**
+ * Fetch all deleted calendars from the server
+ *
  * @returns {Promise<Calendar[]>}
  */
-const findAllCalendars = () => {
-	return getClient().calendarHomes[0].findAllCalendars()
+const findAllDeletedCalendars = async() => {
+	const collections = await getClient()
+		.calendarHomes[0]
+		.findAll()
+	return collections
+		.filter(coll => coll._props['{DAV:}resourcetype'].includes('{http://nextcloud.com/ns}deleted-calendar'))
 }
 
 /**
@@ -116,7 +136,7 @@ const findPublicCalendarsByTokens = async(tokens) => {
  * @returns {Promise<ScheduleInbox[]>}
  */
 const findSchedulingInbox = async() => {
-	const inboxes = await getClient().calendarHomes[0].findAllScheduleInboxes()
+	const inboxes = await getCalendarHome().findAllScheduleInboxes()
 	return inboxes[0]
 }
 
@@ -134,7 +154,7 @@ const findSchedulingInbox = async() => {
  * @returns {Promise<ScheduleOutbox>}
  */
 const findSchedulingOutbox = async() => {
-	const outboxes = await getClient().calendarHomes[0].findAllScheduleOutboxes()
+	const outboxes = await getCalendarHome().findAllScheduleOutboxes()
 	return outboxes[0]
 }
 
@@ -149,7 +169,7 @@ const findSchedulingOutbox = async() => {
  * @returns {Promise<Calendar>}
  */
 const createCalendar = async(displayName, color, components, order, timezoneIcs) => {
-	return getClient().calendarHomes[0].createCalendarCollection(displayName, color, components, order, timezoneIcs)
+	return getCalendarHome().createCalendarCollection(displayName, color, components, order, timezoneIcs)
 }
 
 /**
@@ -164,7 +184,7 @@ const createCalendar = async(displayName, color, components, order, timezoneIcs)
  * @returns {Promise<Calendar>}
  */
 const createSubscription = async(displayName, color, source, order) => {
-	return getClient().calendarHomes[0].createSubscribedCollection(displayName, color, source, order)
+	return getCalendarHome().createSubscribedCollection(displayName, color, source, order)
 }
 
 /**
@@ -173,7 +193,7 @@ const createSubscription = async(displayName, color, source, order) => {
  * @returns {Promise<Calendar>}
  */
 const enableBirthdayCalendar = async() => {
-	await getClient().calendarHomes[0].enableBirthdayCalendar()
+	await getCalendarHome().enableBirthdayCalendar()
 	return getBirthdayCalendar()
 }
 
@@ -183,7 +203,7 @@ const enableBirthdayCalendar = async() => {
  * @returns {Promise<Calendar>}
  */
 const getBirthdayCalendar = async() => {
-	return getClient().calendarHomes[0].find(CALDAV_BIRTHDAY_CALENDAR)
+	return getCalendarHome().find(CALDAV_BIRTHDAY_CALENDAR)
 }
 
 /**
@@ -218,7 +238,8 @@ const findPrincipalByUrl = async(url) => {
 export {
 	initializeClientForUserView,
 	initializeClientForPublicView,
-	findAllCalendars,
+	findAll,
+	findAllDeletedCalendars,
 	findPublicCalendarsByTokens,
 	findSchedulingInbox,
 	findSchedulingOutbox,
diff --git a/src/services/windowTitleService.js b/src/services/windowTitleService.js
index 435d598b79..8b61935573 100644
--- a/src/services/windowTitleService.js
+++ b/src/services/windowTitleService.js
@@ -74,6 +74,9 @@ export default function(router, store) {
 		if (mutation.type !== 'setMomentLocale') {
 			return
 		}
+		if (!router.currentRoute.params?.firstDay) {
+			return
+		}
 
 		const date = getDateFromFirstdayParam(router.currentRoute.params.firstDay)
 		const view = router.currentRoute.params.view
diff --git a/src/store/calendars.js b/src/store/calendars.js
index ebbf7bd405..cc5b449145 100644
--- a/src/store/calendars.js
+++ b/src/store/calendars.js
@@ -27,7 +27,8 @@ import Vue from 'vue'
 import {
 	createCalendar,
 	createSubscription,
-	findAllCalendars,
+	findAll,
+	findAllDeletedCalendars,
 	findPublicCalendarsByTokens,
 } from '../services/caldavService.js'
 import { mapCDavObjectToCalendarObject } from '../models/calendarObject'
@@ -47,6 +48,9 @@ import {
 
 const state = {
 	calendars: [],
+	trashBin: undefined,
+	deletedCalendars: [],
+	deletedCalendarObjects: [],
 	calendarsById: {},
 	initialCalendarsLoaded: false,
 }
@@ -63,10 +67,68 @@ const mutations = {
 	addCalendar(state, { calendar }) {
 		const object = getDefaultCalendarObject(calendar)
 
-		state.calendars.push(object)
+		if (!state.calendars.some(existing => existing.id === object.id)) {
+			state.calendars.push(object)
+		}
 		Vue.set(state.calendarsById, object.id, object)
 	},
 
+	addTrashBin(state, { trashBin }) {
+		state.trashBin = trashBin
+	},
+
+	/**
+	 * Adds deleted calendar into state
+	 *
+	 * @param {Object} state the store data
+	 * @param {Object} data destructuring object
+	 * @param {Object} data.calendar calendar the calendar to add
+	 */
+	addDeletedCalendar(state, { calendar }) {
+		if (state.deletedCalendars.some(c => c.url === calendar.url)) {
+			// This calendar is already known
+			return
+		}
+		state.deletedCalendars.push(calendar)
+	},
+
+	/**
+	 * Removes a deleted calendar
+	 *
+	 * @param {Object} state the store data
+	 * @param {Object} data destructuring object
+	 * @param {Object} data.calendar the deleted calendar to remove
+	 */
+	removeDeletedCalendar(state, { calendar }) {
+		state.deletedCalendars = state.deletedCalendars.filter(c => c !== calendar)
+	},
+
+	/**
+	 * Removes a deleted calendar object
+	 *
+	 * @param {Object} state the store data
+	 * @param {Object} data destructuring object
+	 * @param {Object} data.vobject the deleted calendar object to remove
+	 */
+	removeDeletedCalendarObject(state, { vobject }) {
+		state.deletedCalendarObjects = state.deletedCalendarObjects.filter(vo => vo.id !== vobject.id)
+	},
+
+	/**
+	 * Adds a deleted vobject into state
+	 *
+	 * @param {Object} state the store data
+	 * @param {Object} data destructuring object
+	 * @param {Object} data.vobject the calendar vobject to add
+	 */
+	addDeletedCalendarObject(state, { vobject }) {
+		if (state.deletedCalendarObjects.some(c => c.uri === vobject.uri)) {
+			// This vobject is already known
+			return
+		}
+		state.deletedCalendarObjects.push(vobject)
+	},
+
 	/**
 	 * Deletes a calendar
 	 *
@@ -338,6 +400,45 @@ const getters = {
 			.sort((a, b) => a.order - b.order)
 	},
 
+	hasTrashBin(state) {
+		return state.trashBin !== undefined
+	},
+
+	trashBin(state) {
+		return state.trashBin
+	},
+
+	/**
+	 * List of deleted sorted calendars
+	 *
+	 * @param {Object} state the store data
+	 * @returns {Array}
+	 */
+	sortedDeletedCalendars(state) {
+		return state.deletedCalendars
+			.sort((a, b) => a.deletedAt - b.deletedAt)
+	},
+
+	/**
+	 * List of deleted calendars objects
+	 *
+	 * @param {Object} state the store data
+	 * @returns {Array}
+	 */
+	deletedCalendarObjects(state) {
+		const calendarUriMap = {}
+		state.calendars.forEach(calendar => {
+			const withoutTrail = calendar.url.replace(/\/$/, '')
+			const uri = withoutTrail.substr(withoutTrail.lastIndexOf('/') + 1)
+			calendarUriMap[uri] = calendar
+		})
+
+		return state.deletedCalendarObjects.map(obj => ({
+			calendar: calendarUriMap[obj.dav._props['{http://nextcloud.com/ns}calendar-uri']],
+			...obj,
+		}))
+	},
+
 	/**
 	 * List of sorted subscriptions
 	 *
@@ -432,19 +533,55 @@ const getters = {
 const actions = {
 
 	/**
-	 * Retrieve and commit calendars
+	 * Retrieve and commit calendars and other collections
 	 *
 	 * @param {Object} context the store mutations
-	 * @returns {Promise<Array>} the calendars
+	 * @returns {Promise<Object>} the results
 	 */
-	async getCalendars({ commit, state, getters }) {
-		const calendars = await findAllCalendars()
+	async loadCollections({ commit, state, getters }) {
+		const { calendars, trashBins } = await findAll()
+		console.info('calendar home scanned', calendars, trashBins)
 		calendars.map((calendar) => mapDavCollectionToCalendar(calendar, getters.getCurrentUserPrincipal)).forEach(calendar => {
 			commit('addCalendar', { calendar })
 		})
+		if (trashBins.length) {
+			commit('addTrashBin', { trashBin: trashBins[0] })
+		}
 
 		commit('initialCalendarsLoaded')
-		return state.calendars
+		return {
+			calendars: state.calendars,
+			trashBin: state.trashBin,
+		}
+	},
+
+	/**
+	 * Retrieve and commit deleted calendars
+	 *
+	 * @param {Object} context the store mutations
+	 * @returns {Promise<Array>} the calendars
+	 */
+	async loadDeletedCalendars({ commit }) {
+		const calendars = await findAllDeletedCalendars()
+
+		calendars.forEach(calendar => commit('addDeletedCalendar', { calendar }))
+	},
+
+	/**
+	 * Retrieve and commit deleted calendar objects
+	 */
+	async loadDeletedCalendarObjects({ commit, state }) {
+		const vobjects = await state.trashBin.findDeletedObjects()
+		console.info('vobjects loaded', { vobjects })
+
+		vobjects.forEach(vobject => {
+			try {
+				const calendarObject = mapCDavObjectToCalendarObject(vobject, undefined)
+				commit('addDeletedCalendarObject', { vobject: calendarObject })
+			} catch (error) {
+				console.error('could not convert calendar object', vobject, error)
+			}
+		})
 	},
 
 	/**
@@ -529,6 +666,22 @@ const actions = {
 		context.commit('deleteCalendar', { calendar })
 	},
 
+	async restoreCalendar({ commit, state }, { calendar }) {
+		await state.trashBin.restore(calendar.url)
+
+		commit('removeDeletedCalendar', { calendar })
+	},
+
+	async restoreCalendarObject({ commit, state, dispatch }, { vobject }) {
+		await state.trashBin.restore(vobject.uri)
+
+		// Clean up the data locally
+		commit('removeDeletedCalendarObject', { vobject })
+
+		// Make sure the affected calendar is refreshed
+		commit('incrementModificationCount')
+	},
+
 	/**
 	 * Toggle whether a calendar is enabled
 	 *
diff --git a/src/views/Calendar.vue b/src/views/Calendar.vue
index 28ebdcd79e..af0a639578 100644
--- a/src/views/Calendar.vue
+++ b/src/views/Calendar.vue
@@ -33,6 +33,7 @@
 				<CalendarListNew
 					v-if="!loadingCalendars && isAuthenticatedUser"
 					:disabled="loadingCalendars" />
+				<Trashbin v-if="hasTrashBin" />
 			</template>
 			<!-- Settings and import -->
 			<template #footer>
@@ -81,6 +82,7 @@ import {
 	getYYYYMMDDFromFirstdayParam,
 } from '../utils/date.js'
 import getTimezoneManager from '../services/timezoneDataProviderService'
+import logger from '../utils/logger'
 import {
 	mapGetters,
 	mapState,
@@ -91,6 +93,7 @@ import {
 	showWarning,
 } from '@nextcloud/dialogs'
 import '@nextcloud/dialogs/styles/toast.scss'
+import Trashbin from '../components/AppNavigation/CalendarList/Trashbin'
 
 export default {
 	name: 'Calendar',
@@ -106,6 +109,7 @@ export default {
 		AppNavigation,
 		AppNavigationSpacer,
 		CalendarListNew,
+		Trashbin,
 	},
 	data() {
 		return {
@@ -117,7 +121,9 @@ export default {
 	computed: {
 		...mapGetters({
 			timezoneId: 'getResolvedTimezone',
-		}),
+			'hasTrashBin': 'hasTrashBin',
+		},
+		),
 		...mapState({
 			eventLimit: state => state.settings.eventLimit,
 			skipPopover: state => state.settings.skipPopover,
@@ -130,7 +136,7 @@ export default {
 			modificationCount: state => state.calendarObjects.modificationCount,
 		}),
 		defaultDate() {
-			return getYYYYMMDDFromFirstdayParam(this.$route.params.firstDay)
+			return getYYYYMMDDFromFirstdayParam(this.$route.params?.firstDay ?? 'now')
 		},
 		isEditable() {
 			// We do not allow drag and drop when the editor is open.
@@ -212,7 +218,8 @@ export default {
 		} else {
 			await initializeClientForUserView()
 			await this.$store.dispatch('fetchCurrentUserPrincipal')
-			const calendars = await this.$store.dispatch('getCalendars')
+			const { calendars, trashBin } = await this.$store.dispatch('loadCollections')
+			logger.debug('calendars and trash bin loaded', { calendars, trashBin })
 			const owners = []
 			calendars.forEach((calendar) => {
 				if (owners.indexOf(calendar.owner) === -1) {
@@ -231,6 +238,7 @@ export default {
 
 			// No writeable calendars? Create a new one!
 			if (writeableCalendarIndex === -1) {
+				logger.info('User has no writable calendar, a new personal calendar will be created')
 				this.loadingCalendars = true
 				await this.$store.dispatch('appendCalendar', {
 					displayName: this.$t('calendars', 'Personal'),
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 3a0928f02d..a325d67781 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -152,7 +152,7 @@ export default {
 		async initializeEnvironment() {
 			await initializeClientForUserView()
 			await this.$store.dispatch('fetchCurrentUserPrincipal')
-			await this.$store.dispatch('getCalendars')
+			await this.$store.dispatch('loadCollections')
 
 			const {
 				show_tasks: showTasks,