diff --git a/templates/Includes/EventList.ss b/templates/Includes/EventList.ss
index 0fb198e..91ed66e 100755
--- a/templates/Includes/EventList.ss
+++ b/templates/Includes/EventList.ss
@@ -2,7 +2,7 @@
 <% loop Events %>
 <li class="vevent clearfix">
   <h3 class="summary"><% if Announcement %>$Title<% else %><a class="url" href="$Link">$Event.Title</a><% end_if %></h3>
-  <p class="dates">$DateRange <% if AllDay %><% _t('Calendar.ALLDAY','All Day') %><% else %><% if StartTime %>$TimeRange<% end_if %><% end_if %></p>
+  <p class="dates">$DateRange<% if AllDay %> <% _t('Calendar.ALLDAY','All Day') %><% else %><% if StartTime %> $TimeRange<% end_if %><% end_if %></p>
   <p><a href="$ICSLink"><% _t('Calendar.ADD','Add this to Calendar') %></a></p>
   <% if Announcement %>
   $Content
@@ -14,7 +14,7 @@
     <h4><% _t('Calendar.ADDITIONALDATES','Additional Dates for this Event') %>:</h4>
     <ul>
       <% loop OtherDates %>
-      <li><a href="$Link" title="$Event.Title">$DateRange <% if StartTime %> $TimeRange<% end_if %></a></li>
+      <li><a href="$Link" title="$Event.Title">$DateRange<% if AllDay %> <% _t('Calendar.ALLDAY','All Day') %><% else %><% if StartTime %> $TimeRange<% end_if %><% end_if %></a></li>
       <% end_loop %>
     </ul>
   </div>
diff --git a/templates/Layout/CalendarEvent.ss b/templates/Layout/CalendarEvent.ss
index 3d84577..5a1e8a0 100755
--- a/templates/Layout/CalendarEvent.ss
+++ b/templates/Layout/CalendarEvent.ss
@@ -5,7 +5,7 @@ $MonthJumper
   <h3 class="summary">$Title</h3>
 
   <% with CurrentDate %>
-  <p class="dates">$DateRange<% if StartTime %> $TimeRange<% end_if %></p>
+  <p class="dates">$DateRange<% if AllDay %> <% _t('Calendar.ALLDAY','All Day') %><% else %><% if StartTime %> $TimeRange<% end_if %><% end_if %></p>
   <p><a href="$ICSLink"><% _t('CalendarEvent.ADD','Add this to Calendar') %></a></p>
   <% end_with %>
   
@@ -16,7 +16,7 @@ $MonthJumper
     <h4><% _t('CalendarEvent.ADDITIONALDATES','Additional Dates for this Event') %></h4>
     <ul>
       <% loop OtherDates %>
-      <li><a href="$Link" title="$Event.Title">$DateRange<% if StartTime %> $TimeRange<% end_if %></a></li>
+      <li><a href="$Link" title="$Event.Title">$DateRange<% if AllDay %> <% _t('Calendar.ALLDAY','All Day') %><% else %><% if StartTime %> $TimeRange<% end_if %><% end_if %></a></li>
       <% end_loop %> 
     </ul>
   </div>