diff --git a/SparkleShare/Mac/SparkleEventLog.cs b/SparkleShare/Mac/SparkleEventLog.cs
index 38af8234..ca9412e6 100755
--- a/SparkleShare/Mac/SparkleEventLog.cs
+++ b/SparkleShare/Mac/SparkleEventLog.cs
@@ -84,7 +84,7 @@ namespace SparkleShare {
                 Bordered        = false,
                 Editable        = false,
                 Frame           = new RectangleF (60, 588, 75, 20),
-                StringValue     = Controller.Size,
+                StringValue     = "…",
                 Font            = SparkleUI.Font
             };
 
@@ -105,7 +105,7 @@ namespace SparkleShare {
                 Bordered        = false,
                 Editable        = false,
                 Frame           = new RectangleF (190, 588, 75, 20),
-                StringValue     = Controller.HistorySize,
+                StringValue     = "…",
                 Font            = SparkleUI.Font
             };
 
diff --git a/SparkleShare/SparkleEventLog.cs b/SparkleShare/SparkleEventLog.cs
index 72eb817e..5886a5ede 100755
--- a/SparkleShare/SparkleEventLog.cs
+++ b/SparkleShare/SparkleEventLog.cs
@@ -60,8 +60,7 @@ namespace SparkleShare {
             DeleteEvent += Close;
 
             this.size_label = new Label () {
-                Markup = "<b>Size:</b> " + Controller.Size + "   " +
-                         "<b>History:</b> " + Controller.HistorySize
+                Markup = "<b>Size:</b> …   <b>History:</b> …"
             };
 
             VBox layout_vertical = new VBox (false, 0);
diff --git a/SparkleShare/SparkleEventLogController.cs b/SparkleShare/SparkleEventLogController.cs
index 9e9cb229..99917216 100755
--- a/SparkleShare/SparkleEventLogController.cs
+++ b/SparkleShare/SparkleEventLogController.cs
@@ -54,6 +54,9 @@ namespace SparkleShare {
                 if (ContentLoadingEvent != null)
                     ContentLoadingEvent ();
 
+                if (UpdateSizeInfoEvent != null)
+                    UpdateSizeInfoEvent ("…", "…");
+
                 Stopwatch watch = new Stopwatch ();
                 watch.Start ();
 
@@ -80,6 +83,10 @@ namespace SparkleShare {
         public string HTML {
             get {
                 List<SparkleChangeSet> change_sets = Program.Controller.GetLog (this.selected_folder);
+
+                if (UpdateSizeInfoEvent != null)
+                    UpdateSizeInfoEvent (Size, HistorySize);
+
                 return Program.Controller.GetHTMLLog (change_sets);
             }
         }
@@ -97,11 +104,18 @@ namespace SparkleShare {
                 foreach (SparkleRepoBase repo in Program.Controller.Repositories) {
                     if (this.selected_folder == null)
                         size += repo.Size;
-                    else if (this.selected_folder.Equals (repo.Name))
-                        return Program.Controller.FormatSize (repo.Size);
+                    else if (this.selected_folder.Equals (repo.Name)) {
+                        if (repo.Size == 0)
+                            return "???";
+                        else
+                            return Program.Controller.FormatSize (repo.Size);
+                    }
                 }
 
-                return Program.Controller.FormatSize (size);
+                if (size == 0)
+                    return "???";
+                else
+                    return Program.Controller.FormatSize (size);
             }
         }
 
@@ -112,11 +126,18 @@ namespace SparkleShare {
                 foreach (SparkleRepoBase repo in Program.Controller.Repositories) {
                     if (this.selected_folder == null)
                         size += repo.HistorySize;
-                    else if (this.selected_folder.Equals (repo.Name))
-                        return Program.Controller.FormatSize (repo.HistorySize);
+                    else if (this.selected_folder.Equals (repo.Name)) {
+                        if (repo.HistorySize == 0)
+                            return "???";
+                        else
+                            return Program.Controller.FormatSize (repo.HistorySize);
+                    }
                 }
 
-                return Program.Controller.FormatSize (size);
+                if (size == 0)
+                    return "???";
+                else
+                    return Program.Controller.FormatSize (size);
             }
         }