diff --git a/modules/issuetracker/skins/xe_issuetracker/timeline.html b/modules/issuetracker/skins/xe_issuetracker/timeline.html
index f0beec6c6..8d68f1a7f 100644
--- a/modules/issuetracker/skins/xe_issuetracker/timeline.html
+++ b/modules/issuetracker/skins/xe_issuetracker/timeline.html
@@ -21,15 +21,14 @@
 <div class="clear"></div>
 
 
-{@ $curDate = null }
+{@ $curDate = null}
 <!--@foreach($changesets as $changeset)-->
-<!--@if($curdate || strcmp(zdate($changeset->date, "Ymd"),  $curDate))-->
-<h4>{zdate($changeset->date, "Y-m-d")}</h4>
-<!--@if($curDate)-->
-</dl>
-<!--@end-->
+
+<!--@if(!$curDate || $curDate != zdate($changeset->date, "Y-m-d"))-->
+{@ $curDate = zdate($changeset->date, "Y-m-d")}
+<!--@if($curDate)--></dl><!--@end-->
+<h4>{$curDate}</h4>
 <dl class="changeset">
-{@ $curDate = zdate($changeset->date, "Ymd") }
 <!--@end-->
 <dt>
     <span class="time">{zdate($changeset->date,"H:i")}</span>
diff --git a/modules/issuetracker/skins/xe_issuetracker/view_issue.html b/modules/issuetracker/skins/xe_issuetracker/view_issue.html
index e2b5d5cc9..4c0a6b006 100644
--- a/modules/issuetracker/skins/xe_issuetracker/view_issue.html
+++ b/modules/issuetracker/skins/xe_issuetracker/view_issue.html
@@ -269,7 +269,6 @@
                 </ul>
             </td>
         </tr>
-        <!--@end-->
         </table>
         <!--@end-->
 
@@ -291,5 +290,6 @@
 
 </form>
 <!--@end-->
+<!--@end-->
 
 <!--#include("footer.html")-->