diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs
index 76301bc4..a67ee9a6 100644
--- a/SparkleShare/SparkleStatusIcon.cs
+++ b/SparkleShare/SparkleStatusIcon.cs
@@ -144,6 +144,8 @@ namespace SparkleShare {
 			Pixbuf = SparkleHelpers.GetIcon ("folder-sparkleshare", 24);
 		}
 
+		// TODO: There are UI freezes when switching back and forth
+		// bewteen syncing and idle state
 		public void SetSyncingState () {
 
 			int CycleDuration = 250;
diff --git a/SparkleShare/SparkleUI.cs b/SparkleShare/SparkleUI.cs
index b69a4cdd..1197bb79 100644
--- a/SparkleShare/SparkleUI.cs
+++ b/SparkleShare/SparkleUI.cs
@@ -91,6 +91,7 @@ namespace SparkleShare {
 					i++;
 
 					// Attach emblems
+					// TODO: emblems don't work in nautilus
 					switch (SparklePlatform.Name) {
 						case "GNOME":
 							Process.StartInfo.FileName = "gvfs-set-attribute";