diff --git a/UI/Scheduler/UIxCalInlineAptView.m b/UI/Scheduler/UIxCalInlineAptView.m
index 264187652..994a1f7c7 100644
--- a/UI/Scheduler/UIxCalInlineAptView.m
+++ b/UI/Scheduler/UIxCalInlineAptView.m
@@ -25,6 +25,7 @@
 #import <Foundation/NSDictionary.h>
 
 #import <NGObjWeb/NGObjWeb.h>
+#import <NGCards/iCalEntityObject.h>
 
 @interface UIxCalInlineAptView : WOComponent
 {
@@ -139,22 +140,22 @@
     [ms appendFormat:@" apt_prio%@", prio];
   }
   email = [[[self context] activeUser] email];
-  if ((s = [appointment valueForKey:@"orgmail"])) {
-    if ([s rangeOfString:email].length > 0) {
-      [ms appendString:@" apt_organizer"];
+  s = [appointment valueForKey:@"orgmail"];
+  if ([s isNotNull])
+    {
+      if ([s rangeOfString: email].length > 0)
+        [ms appendString:@" apt_organizer"];
+      else
+        [ms appendString:@" apt_other"];
     }
-    else {
-      [ms appendString:@" apt_other"];
+  s = [appointment valueForKey:@"partmails"];
+  if ([s isNotNull])
+    {
+      if ([s rangeOfString:email].length > 0)
+        [ms appendString:@" apt_participant"];
+      else
+        [ms appendString:@" apt_nonparticipant"];
     }
-  }
-  if ((s = [appointment valueForKey:@"partmails"])) {
-    if ([s rangeOfString:email].length > 0) {
-      [ms appendString:@" apt_participant"];
-    }
-    else {
-      [ms appendString:@" apt_nonparticipant"];
-    }
-  }
   ASSIGNCOPY(style, ms);
 }
 
@@ -250,6 +251,16 @@
 
 /* helpers */
 
+- (NSString *) startHour
+{
+  NSCalendarDate *start;
+
+  start = [appointment objectForKey: @"startDate"];
+
+  return [NSString stringWithFormat: @"%.2d:%.2d",
+                   [start hourOfDay], [start minuteOfHour]];
+}
+
 - (NSString *) title
 {
   return [formatter stringForObjectValue: appointment
@@ -262,4 +273,9 @@
                            referenceDate: [self referenceDate]];
 }
 
+- (BOOL) isConfidential
+{
+  return ([[appointment objectForKey: @"classification"] intValue] == iCalAccessConfidential);
+}
+
 @end
diff --git a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
index 64d5c6f21..10aded341 100644
--- a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
@@ -1,22 +1,35 @@
 <?xml version='1.0' standalone='yes'?>
-  <div
-    var:class="displayClasses"
-    var:aptCName="appointment.c_name"
-    var:owner="appointment.owner"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:rsrc="OGo:url">
-    <div class="shadow shadow1"><!-- space --></div
-      ><div class="shadow shadow2"><!-- space --></div
-      ><div class="shadow shadow3"><!-- space --></div
-      ><div class="shadow shadow4"><!-- space --></div
-      ><div var:class="innerDisplayClasses"
-      ><div class="gradient"
-        ><img rsrc:src="event-gradient.png" class="gradient"
-          /></div
-        ><div class="text"
-        ><var:string value="appointment.title" const:escapeHTML="NO"
-          /></div>
-    </div>
+<!DOCTYPE div>
+<div
+  var:class="displayClasses"
+  var:aptCName="appointment.c_name"
+  var:owner="appointment.owner"
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:rsrc="OGo:url">
+  <div class="shadow shadow1"><!-- space --></div
+    ><div class="shadow shadow2"><!-- space --></div
+    ><div class="shadow shadow3"><!-- space --></div
+    ><div class="shadow shadow4"><!-- space --></div
+    ><div var:class="innerDisplayClasses"
+    ><div class="gradient"
+      ><img rsrc:src="event-gradient.png" class="gradient"
+        /></div
+      ><div class="text"
+      ><span class="eventHeader"><var:string value="startHour"
+          const:escapeHTML="NO"
+          /><var:if condition="appointment.iscycle"
+          ><img rsrc:src="repeat-16.png" class="gradient"
+            /></var:if
+          ><var:if condition="appointment.hasalarm"
+          ><img rsrc:src="alarm.png" class="gradient"
+            /></var:if
+          ></span
+        ><var:if condition="isConfidential" const:negate="YES"
+        ><br
+          /><var:string value="appointment.title" const:escapeHTML="NO"
+          /></var:if
+        ></div>
   </div>
+</div>