diff --git a/SparkleShare/Mac/SparkleEventLog.cs b/SparkleShare/Mac/SparkleEventLog.cs
index 2ba9b985..fdae5923 100644
--- a/SparkleShare/Mac/SparkleEventLog.cs
+++ b/SparkleShare/Mac/SparkleEventLog.cs
@@ -230,7 +230,7 @@ namespace SparkleShare {
                 if (match.Success) {
                     string folder_name = match.Groups [1].Value;
                     string revision    = match.Groups [2].Value;
-                    string note        = match.Groups [3].Value;
+                    string note        = match.Groups [3].Value.Replace ("%20", " ");
 
                     Thread thread = new Thread (new ThreadStart (delegate {
                         SparkleShare.Controller.AddNoteToFolder (folder_name, revision, note);
diff --git a/data/html/event-entry.html b/data/html/event-entry.html
index ae3cd403..22f967e1 100644
--- a/data/html/event-entry.html
+++ b/data/html/event-entry.html
@@ -11,13 +11,16 @@
         <div class='event-folder' style='background-color: <!-- $event-folder-color -->'><!-- $event-folder --></div>
         </div>
         <!-- $event-entry-content -->
-        <div style='clear: both'></div>
-        <div class="comments-wrapper">
-            <!-- $event-comments -->
-            <textarea class="comment-textarea"></textarea>
+        <div class="comments-section">
+            <div class="comments-wrapper">
+                <!-- $event-comments -->
+                <textarea class="comment-textarea"></textarea>
+
+                <input class="comment-button" type="button" value="Add note"
+                 id="<!-- $event-folder -->~<!-- $event-revision -->">
+                <div style='clear: both'></div>
+            </div>
             <div style='clear: both'></div>
-            <input class="comment-button" type="button" value="Add note"
-             id="<!-- $event-folder -->~<!-- $event-revision -->">
         </div>
         <div style='clear: both'></div>
     </div>
diff --git a/data/html/event-log.html b/data/html/event-log.html
index c707b758..2b63629a 100644
--- a/data/html/event-log.html
+++ b/data/html/event-log.html
@@ -5,6 +5,17 @@
         <script type="text/javascript" src="<!-- $jquery-url -->"></script>
         <script type="text/javascript">
           $(document).ready(function () {
+              $('.comments-wrapper').each (function () {
+                if ($(this).find ('.comments').children ().size () < 1) {
+                  $(this).hide ();
+                }
+              });
+
+              $('.comments-section').click(function () {
+                 $(this).find ('.comments-wrapper').show ();
+                 $(this).find ('.comments-wrapper').css ('cursor', 'default');
+              });
+
               $("input").click(function () {
                  textarea = $(this).parent ().find ('textarea');
                  text = textarea.val ();
@@ -90,7 +101,6 @@
                 background-color: #f0f0f0;
                 margin-bottom:    12px;
                 padding:          0px;
-                padding-bottom:   6px;
                 border:           #ccc 1px solid;
             }
 
@@ -122,6 +132,7 @@
 
             dd:last-child {
                 border: none;
+                margin-bottom: 6px;
             }
 
             .document-added {
@@ -182,31 +193,38 @@
             .comment-button {
                 float:right;
                 margin-top: 6px;
-                margin-bottom: 6px;"
+                margin-bottom: 12px;
             }
 
             .comment-textarea {
-                margin-top:         12px;
                 box-sizing:         border-box;
                 -webkit-box-sizing: border-box;
-                -moz-box-sizing:    border-box;
                 width:              100%;
-                height:             40px;
+                height:             50px;
+                padding-bottom:     6px;
+            }
+
+            .comments-section {
+                box-sizing:         border-box;
+                -webkit-box-sizing: border-box;
+                border-top:         1px #ccc solid;
+                width: 100%;
+                height: 9px;
             }
 
             .comments-wrapper {
-                margin-top:         9px;
-                border-top:         1px #ccc solid;
                 box-sizing:         border-box;
                 -webkit-box-sizing: border-box;
-                -moz-box-sizing:    border-box;
-                margin-top:         3px;
                 width:              100%;
                 padding:            12px;
             }
 
+            .comments-section:hover {
+                cursor: pointer;
+            }
+
             .comment-text {
-                padding-bottom: 6px;
+                padding-bottom: 15px;
             }
         </style>
     </head>