diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet
index c995a4ff44..68c772a246 100644
--- a/calendar/templates/default/edit.xet
+++ b/calendar/templates/default/edit.xet
@@ -251,11 +251,13 @@
 						</tabpanels>
 					</tabbox>
 				</row>
-				<row disabled="!@owner" class="dialogOperators">
-					<description value="Owner"/>
+				<row disabled="!@id" class="dialogOperators">
+					<hbox span="2">
+						<date-time label="created" id="created" no_lang="1" readonly="true"/>
 					<menulist>
-						<menupopup type="select-account" id="owner" readonly="true"/>
+							<menupopup label = "by" type="select-account" id="owner" readonly="true"/>
 					</menulist>
+					</hbox>
 					<hbox align="right">
 						<date-time label="Updated" id="modified" no_lang="1" readonly="true"/>
 						<menulist>
diff --git a/calendar/templates/mobile/edit.xet b/calendar/templates/mobile/edit.xet
index f102ccd551..da2487a8f0 100644
--- a/calendar/templates/mobile/edit.xet
+++ b/calendar/templates/mobile/edit.xet
@@ -197,21 +197,23 @@
 				<column/>
 			</columns>
 			<rows>
-				<row disabled="!@owner">
-					<description value="Owner"/>
-					<menulist>
-						<menupopup type="select-account" id="owner" readonly="true"/>
-					</menulist>
+				<row disabled="!@id">
+					<description value="Created"/>
+					<hbox>
+						<menulist>
+							<menupopup type="select-account" id="owner" readonly="true"/>
+						</menulist>
+						<date-time id="created" no_lang="1" readonly="true"/>
+					</hbox>
 				</row>
 				<row disabled="!@modified">
 					<description value="Updated"/>
-					<date-time id="modified" no_lang="1" readonly="true"/>
-				</row>
-				<row disabled="!@modifier">
-					<description value="by"/>
-					<menulist>
-						<menupopup type="select-account"   class="et2_nowrap" id="modifier" readonly="true"/>
-					</menulist>
+					<hbox>
+						<menulist>
+							<menupopup type="select-account"   class="et2_nowrap" id="modifier" readonly="true"/>
+						</menulist>
+						<date-time id="modified" no_lang="1" readonly="true"/>
+					</hbox>
 				</row>
 			</rows>
 		</grid>
@@ -225,11 +227,10 @@
 			<rows>
 				<row disabled="@hidebuttons" class="dialogHeadbar" >
 					<hbox  span="all" width="100%">
-						<button statustext="Saves this entry" id="button[save]" image="save" background_image="1"/>
 						<button statustext="Apply the changes" id="button[apply]" image="apply" background_image="1"/>
 						<button statustext="delete this entry" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete');" image="delete" background_image="1" span="all"/>
 						<buttononly statustext="Find free timeslots where the selected participants are availible for the given timespan" id="freetime" label="Freetime" onclick="app.calendar.freetime_search" image="add" background_image="1"/>
-						<checkbox label="notification" id="no_notifications"/>
+						<checkbox label="Do not notify" id="no_notifications"/>
 						<textbox type="hidden" id="delete_exceptions"/>
 					</hbox>
 				</row>