diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs
index 0a5a2061..0c15e048 100755
--- a/SparkleLib/SparkleRepoBase.cs
+++ b/SparkleLib/SparkleRepoBase.cs
@@ -386,7 +386,10 @@ namespace SparkleLib {
 
                 ChangeSets = GetChangeSets ();
 
-                if (!pre_sync_revision.Equals (CurrentRevision) && ChangeSets != null && ChangeSets.Count > 0) {
+                if (!pre_sync_revision.Equals (CurrentRevision) &&
+                    ChangeSets != null && ChangeSets.Count > 0 &&
+                    !ChangeSets [0].User.Name.Equals (this.local_config.User.Name)) {
+
                     bool emit_change_event = true;
 
                     foreach (SparkleChange change in ChangeSets [0].Changes) {
diff --git a/SparkleLib/SparkleWrappers.cs b/SparkleLib/SparkleWrappers.cs
index ca108513..15cc250a 100644
--- a/SparkleLib/SparkleWrappers.cs
+++ b/SparkleLib/SparkleWrappers.cs
@@ -50,21 +50,11 @@ namespace SparkleLib {
             case SparkleChangeType.Deleted: message = "deleted ‘{0}’"; break;
             case SparkleChangeType.Moved:   message = "moved ‘{0}’"; break;
             }
-            
-            if (Changes.Count == 1) {
-                return message = string.Format (message, Changes [0].Path);
-                
-            } else if (Changes.Count > 1) {
-                message = string.Format (message, Changes [0].Path);
-                
-                if ((Changes.Count - 1) == 1)
-                    return string.Format (message + " and one other event", Changes.Count - 1);
-                else
-                    return string.Format (message + " and {0} other events", Changes.Count - 1);
-                
-            } else {
+
+            if (Changes.Count > 0)
+                return string.Format (message, Changes [0].Path);
+            else
                 return "did something magical";
-            }
         }
     }