diff --git a/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/ui/AgendaPropertyForm.java b/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/ui/AgendaPropertyForm.java
index 28d199687..1cab09256 100755
--- a/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/ui/AgendaPropertyForm.java
+++ b/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/ui/AgendaPropertyForm.java
@@ -112,8 +112,8 @@ public class AgendaPropertyForm extends BasicPageForm
                         "cms.contenttypes.ui.summary"));
         add(summary);
 
-     // add(new Label(AgendaGlobalizationUtil
-     //               .globalize("cms.contenttypes.ui.agenda.agenda_date")));
+      add(new Label(AgendaGlobalizationUtil
+                    .globalize("cms.contenttypes.ui.agenda.agenda_date")));
         ParameterModel agendaDateParam = new DateTimeParameter(AGENDA_DATE);
         agendaDateParam
             .addParameterListener(new NotNullValidationListener());
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
index 11f49f412..6062cf6f3 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
@@ -641,6 +641,38 @@
         </xsl:choose>
     </xsl:template>
     
+   
+    <xsl:template match="/content-item-layout//show-date-property">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        <xsl:variable name="name" select="./@name"/>
+        
+        <xsl:choose>
+            <xsl:when test="$contentitem-tree/*[name() = $name]">
+                <xsl:call-template name="foundry:format-date">
+                    <xsl:with-param name="date-elem" 
+                                    select="$contentitem-tree/*[name() = $name]"/>
+                    <xsl:with-param name="date-format"
+                                    select="./date-format"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="$contentitem-tree/nav:attribute[@name = $name]">
+                <xsl:call-template name="foundry:format-date">
+                    <xsl:with-param name="date-elem" 
+                                    select="$contentitem-tree/nav:attribute[@name = $name]"/>
+                    <xsl:with-param name="date-format"
+                                    select="./date-format"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:if test="foundry:debug-enabled()">
+                    <code>
+                        <xsl:value-of select="concat('No property ', $name, ' found')"/>
+                    </code>
+                </xsl:if>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
     <foundry:doc section="user" type="template-tag">
         <foundry:doc-desc>
             <p>
diff --git a/ccm-core/web/themes/foundry/foundry/styles/admin.css b/ccm-core/web/themes/foundry/foundry/styles/admin.css
index 930041733..c0fd6b669 100644
--- a/ccm-core/web/themes/foundry/foundry/styles/admin.css
+++ b/ccm-core/web/themes/foundry/foundry/styles/admin.css
@@ -1608,6 +1608,19 @@ form#propertyedit input[type='text'] {
     max-width: 55%;
 }
 
+#content form#pageCreate input[type='text'].day,
+#content form#pageCreate input[type='text'].month,
+#content form#pageCreate input[type='text'].year,
+#content form#pageCreate input[type='text'].hour,
+#content form#pageCreate input[type='text'].minute,
+form#propertyedit input[type='text'].day,
+form#propertyedit input[type='text'].month,
+form#propertyedit input[type='text'].year,
+form#propertyedit input[type='text'].hour,
+form#propertyedit input[type='text'].minute {
+    width: 2em;
+}
+
 #content span.option-group input[value="externalLink"]:checked ~ fieldset[class="internalLink"]{
     display:none;
 }