diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet
index 850f20b317..b66fe9d610 100644
--- a/calendar/templates/default/edit.xet
+++ b/calendar/templates/default/edit.xet
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<template id="calendar.edit.general" template="" lang="" group="0" version="1.3.001">
+	<template id="calendar.edit.general" template="" lang="" group="0" version="1.3.002">
 		<grid width="100%" height="200">
 			<columns>
 				<column width="95"/>
@@ -16,9 +16,9 @@
 				</row>
 				<row class="row">
 					<description options=",,,duration" value="Duration"/>
-					<hbox orient=",0,0">
+					<hbox options="0,0">
 						<menulist>
-							<menupopup id="duration" options="Use end date" no_lang="1" statustext="Duration of the meeting" onchange="set_style_by_class('table','end_hide','visibility',this.value == '' ? 'visible' : 'hidden');"/>
+							<menupopup id="duration" options="Use end date" no_lang="1" statustext="Duration of the meeting" onchange="set_style_by_class('table','end_hide','visibility',this.value == '' ? 'visible' : 'hidden'); if (this.value == '') document.getElementById(form::name('end[str]')).value = document.getElementById(form::name('start[str]')).value;"/>
 						</menulist>
 						<date-time id="end" class="end_hide"/>
 					</hbox>
@@ -34,7 +34,7 @@
 				</row>
 				<row class="row">
 					<description options=",,,priority" value="Priority"/>
-					<hbox span="all" orient=",0,0">
+					<hbox options="0,0" span="all">
 						<menulist>
 							<menupopup type="select-priority" id="priority"/>
 						</menulist>
@@ -62,59 +62,48 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="calendar.edit.participants" template="" lang="" group="0" version="1.0.1.003">
-		<grid width="100%" height="200" class="row_on" overflow="auto">
+	<template id="calendar.edit.participants" template="" lang="" group="0" version="1.3.001">
+		<grid width="100%" height="200" overflow="auto">
 			<columns>
 				<column width="95"/>
 				<column/>
 				<column/>
 				<column/>
+				<column/>
 			</columns>
 			<rows>
-				<row class="row" valign="top" disabled="@view">
-					<description options=",,,participants" value="Participants"/>
-					<listbox type="select-account" rows="14" options="calendar+" id="participants[accounts]"/>
-					<description value="Resources" align="right"/>
-					<resources_select options="14" id="participants[resources]"/>
-				</row>
-				<row valign="top" disabled="!@view">
+				<row class="th">
+					<description value="Type"/>
 					<description value="Participants"/>
-					<grid>
-						<columns>
-							<column/>
-							<column/>
-						</columns>
-						<rows>
-							<row>
-								<menulist>
-									<menupopup type="select-account" id="${row}" readonly="true"/>
-								</menulist>
-								<menulist>
-									<menupopup id="accounts_status[$row_cont]" onchange="1" statustext="Accept or reject an invitation" no_lang="1"/>
-								</menulist>
-							</row>
-						</rows>
-					</grid>
-					<description value="Resources" align="right"/>
-					<grid>
-						<columns>
-							<column/>
-							<column/>
-						</columns>
-						<rows>
-							<row disabled="!@resources_status">
-								<resources_select id="${row}" readonly="true" no_lang="1"/>
-								<menulist>
-									<menupopup id="resources_status[$row_cont]" onchange="1" statustext="Accept or reject an invitation" no_lang="1"/>
-								</menulist>
-							</row>
-						</rows>
-					</grid>
+					<description value="Quantity"/>
+					<description value="Status"/>
+					<description value="Delete"/>
+				</row>
+				<row class="row" disabled="@no_add">
+					<description value="New"/>
+					<vbox options="0,0">
+						<menulist>
+							<menupopup type="select-account" options="User or group,both" id="account"/>
+						</menulist>
+						<link-entry id="resource" options="@cal_resources"/>
+					</vbox>
+					<int options="1,,3" id="quantity"/>
+					<button label="Add" id="add"/>
+					<description/>
+				</row>
+				<row valign="top">
+					<description id="${row}[app]"/>
+					<description rows="1" cols="2" id="${row}[title]" no_lang="1"/>
+					<int id="${row}[quantity]" options="1,,3"/>
+					<menulist>
+						<menupopup id="${row}[status]" no_lang="1"/>
+					</menulist>
+					<checkbox rows="1" cols="2" id="delete[$row_cont[uid]]" align="center"/>
 				</row>
 			</rows>
 		</grid>
 	</template>
-	<template id="calendar.edit.recurrence" template="" lang="" group="0" version="1.0.1.002">
+	<template id="calendar.edit.recurrence" template="" lang="" group="0" version="1.3.001">
 		<grid width="100%" height="200">
 			<columns>
 				<column width="95"/>
@@ -143,7 +132,10 @@
 				<row class="row" valign="top">
 					<description options=",,,recur_data" value="Repeat days"/>
 					<listbox type="select-dow" rows="6" options="1" id="recur_data" statustext="Days of the week for a weekly repeated event"/>
-					<description value="Exceptions"/>
+					<vbox options="0,0">
+						<description value="Exceptions"/>
+						<button id="button[exception]" label="@exception_label" statustext="Create an exception for the given date" no_lang="1"/>
+					</vbox>
 					<grid>
 						<columns>
 							<column/>
@@ -255,7 +247,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="calendar.edit" template="" lang="" group="0" version="1.3.001">
+	<template id="calendar.edit" template="" lang="" group="0" version="1.3.002">
 		<grid width="100%">
 			<columns>
 				<column width="100"/>
@@ -294,7 +286,7 @@
 						</tabpanels>
 					</tabbox>
 				</row>
-				<row class="row" disabled="!@owner">
+				<row disabled="!@owner">
 					<description value="Owner"/>
 					<menulist>
 						<menupopup type="select-account" id="owner" readonly="true"/>
@@ -308,14 +300,12 @@
 				</row>
 				<row>
 					<hbox span="2">
-						<button id="button[edit]" label="Edit" statustext="Edit this event"/>
-						<button id="button[exception]" label="Exception" statustext="Create an exception at this recuring event"/>
-						<button id="button[copy]" label="Copy" statustext="Copy this event"/>
-						<button id="button[vcal]" label="Export" statustext="Download this event as iCal"/>
 						<button label="Save" id="button[save]" statustext="saves the changes made"/>
 						<button id="button[apply]" label="Apply" statustext="apply the changes"/>
 						<button id="button[cancel]" label="Cancel" onclick="window.close();" statustext="Close the window"/>
-						<checkbox id="custom_mail" label="mail all participants" statustext="compose a mail to all participants after the event is saved"/>
+						<menulist>
+							<menupopup id="action" statustext="Execute a further action for this entry" options="Actions..." onchange="this.form.submit(); this.value='';"/>
+						</menulist>
 					</hbox>
 					<button label="Delete" id="button[delete]" statustext="Delete this event" onclick="return confirm('Delete this event');" align="right"/>
 				</row>