diff --git a/SparkleShare/Mac/SparkleUI.cs b/SparkleShare/Mac/SparkleUI.cs
index 642cd6f3..ab4163d7 100755
--- a/SparkleShare/Mac/SparkleUI.cs
+++ b/SparkleShare/Mac/SparkleUI.cs
@@ -94,13 +94,13 @@ namespace SparkleShare {
 
         public void UpdateDockIconVisibility ()
         {
-            if (true) { // TODO: check for open windows
+            // if (true) { // TODO: check for open windows
 
                 ShowDockIcon ();
 
-            } else {
-                HideDockIcon ();
-            }
+            // } else {
+            //     HideDockIcon ();
+            // }
         }
 
 
diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index 16676e18..cd3eec3b 100755
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -467,13 +467,17 @@ namespace SparkleShare {
                     today.Month == activity_day.DateTime.Month && 
                     today.Year  == activity_day.DateTime.Year) {
 
-                    day_entry = day_entry_html.Replace ("<!-- $day-entry-header -->", "Today");
+                    day_entry = day_entry_html.Replace ("<!-- $day-entry-header -->",
+                        "<span id='today' name='" + activity_day.DateTime.ToString (_("dddd, MMMM d")) + "'>"
+                        + _("Today") + "</span>");
 
                 } else if (yesterday.Day   == activity_day.DateTime.Day &&
                            yesterday.Month == activity_day.DateTime.Month &&
                            yesterday.Year  == activity_day.DateTime.Year) {
 
-                    day_entry = day_entry_html.Replace ("<!-- $day-entry-header -->", "Yesterday");
+                    day_entry = day_entry_html.Replace ("<!-- $day-entry-header -->",
+                        "<span id='yesterday' name='" + activity_day.DateTime.ToString (_("dddd, MMMM d")) + "'>"
+                        + _("Yesterday") + "</span>");
 
                 } else {
                     if (activity_day.DateTime.Year != DateTime.Now.Year) {
@@ -493,9 +497,13 @@ namespace SparkleShare {
                 event_log += day_entry.Replace ("<!-- $day-entry-content -->", event_entries);
             }
 
-            string html =  event_log_html.Replace ("<!-- $event-log-content -->", event_log)
+
+            int midnight = (int) (DateTime.Today.AddDays (1) - new DateTime (1970, 1, 1)).TotalSeconds;
+            Console.WriteLine (midnight);
+            string html = event_log_html.Replace ("<!-- $event-log-content -->", event_log)
                 .Replace ("<!-- $username -->", UserName)
-                .Replace ("<!-- $user-avatar-url -->", "file://" + GetAvatar (UserEmail, 48));
+                .Replace ("<!-- $user-avatar-url -->", "file://" + GetAvatar (UserEmail, 48))
+                .Replace ("<!-- $midnight -->", midnight.ToString ());
 
             return html;
         }
diff --git a/data/html/event-log.html b/data/html/event-log.html
index 9f985338..11c0f567 100755
--- a/data/html/event-log.html
+++ b/data/html/event-log.html
@@ -5,6 +5,18 @@
         <script type="text/javascript" src="<!-- $jquery-url -->"></script>
         <script type="text/javascript">
           $(document).ready(function () {
+
+              // Update the Today and Yesterday labels after midnight
+              setInterval (function(){
+                var date = new Date();
+
+                if ((date.getTime() / 1000) >= <!-- $midnight -->) {
+                  $("#today").html($("#today").attr("name"));
+                  $("#yesterday").html($("#yesterday").attr("name"));
+                }
+              }, 60 * 1000);
+
+          
               $('.comments-section').each (function () {
                 if ($(this).find ('.comments').children ().size () < 1) {
                   $(this).hide ();