diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 8b3f481d0a44dc3b9a9130dd77113eacbafb79e0..441da772bfa867ea346a87ee00699eb47facb425 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -247,6 +247,9 @@
     <entityField>
       <name>STATUS_ACTION</name>
     </entityField>
+    <entityField>
+      <name>OWNER</name>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
@@ -278,6 +281,9 @@
         <jDitoRecordFieldMapping>
           <name>ORGANIZER.value</name>
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OWNER.value</name>
+        </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>ATTENDEES.value</name>
         </jDitoRecordFieldMapping>
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index ee80cd3135dfe593423991de92f65cd9cade5df2..1537137ac8ec8fb412f232a80567dcafa4a93a5e 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -75,6 +75,8 @@ function buildEntry(pEntry, pMasterentry)
     var description = pEntry[calendars.DESCRIPTION];
     if(pEntry[calendars.ORGANIZER2] != undefined)
         var organizer = pEntry[calendars.ORGANIZER2]["paramvalue"];
+    if(pEntry[calendars.USER2] != undefined)
+        var owner = pEntry[calendars.USER2]["paramvalue"];
     var status = pEntry[calendars.STATUS];
     var location = pEntry[calendars.LOCATION];
     var reminder = pEntry[calendars.REMINDER_DURATION];
@@ -103,6 +105,7 @@ function buildEntry(pEntry, pMasterentry)
             enddate, 
             summary, 
             organizer,
+            owner,
             attendees, 
             status, 
             links, 
diff --git a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
index 9490ed3a36aacd3d0e9b519468f441b564bfb6ba..5b5def3ba12aa516e0da7c4a8a60cdbe653b690b 100644
--- a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
+++ b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
@@ -11,6 +11,7 @@
   <children>
     <appointmentEditViewTemplate>
       <name>Edit</name>
+      <uidField>UID</uidField>
       <summaryField>SUMMARY</summaryField>
       <descriptionField>DESCRIPTION</descriptionField>
       <beginField>BEGIN</beginField>
@@ -23,6 +24,7 @@
       <alldayField>ALLDAY</alldayField>
       <transparencyField>TRANSPARENCY</transparencyField>
       <organizerField>ORGANIZER</organizerField>
+      <ownerField>OWNER</ownerField>
       <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
       <rruleField>RRULE</rruleField>
       <recurrenceIdField>RECURRENCEID</recurrenceIdField>
diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
index baf79830ac15208f34e5c75bded6e40def5ae2c3..23c9de063b24cd94a46c4d2e998832ff9c752798 100644
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
@@ -11,6 +11,7 @@
   <children>
     <appointmentPreviewViewTemplate>
       <name>Appointments</name>
+      <uidField>UID</uidField>
       <summaryField>SUMMARY</summaryField>
       <descriptionField>DESCRIPTION</descriptionField>
       <beginField>BEGIN</beginField>
@@ -24,6 +25,7 @@
       <locationField>LOCATION</locationField>
       <linkField>LINKS</linkField>
       <organizerField>ORGANIZER</organizerField>
+      <ownerField>OWNER</ownerField>
       <categoriesField>CATEGORIES</categoriesField>
       <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
       <favoriteActionGroup2>seriesActionGroup</favoriteActionGroup2>