diff --git a/SparkleShare/Linux/SparkleSetup.cs b/SparkleShare/Linux/SparkleSetup.cs
index c93cc7ba..948054e1 100755
--- a/SparkleShare/Linux/SparkleSetup.cs
+++ b/SparkleShare/Linux/SparkleSetup.cs
@@ -395,8 +395,7 @@ namespace SparkleShare {
                     case PageType.Syncing: {
 
                         Header      = String.Format (_("Adding project ‘{0}’…"), Controller.SyncingFolder);
-                        Description = _("This may take a while.") + Environment.NewLine +
-                                      _("Are you sure it’s not coffee o'clock?");
+                        Description = Description = _("This may either take a short or a long time depending on the project's size.");
 
                         this.progress_bar.Fraction = Controller.ProgressBarPercentage;
 
diff --git a/SparkleShare/Mac/SparkleSetup.cs b/SparkleShare/Mac/SparkleSetup.cs
index 6b2426f4..2b7aa0a9 100755
--- a/SparkleShare/Mac/SparkleSetup.cs
+++ b/SparkleShare/Mac/SparkleSetup.cs
@@ -502,11 +502,9 @@ namespace SparkleShare {
                         }
     
                         case PageType.Syncing: {
-    
                             Header      = "Adding project ‘" + Controller.SyncingFolder + "’…";
-                            Description = "This may take a while.\n" +
-                                          "Are you sure it’s not coffee o'clock?";
-    
+                            Description = "This may either take a short or a long time depending on the project's size.";
+                                
                             ProgressIndicator = new NSProgressIndicator () {
                                 Frame    = new RectangleF (190, Frame.Height - 200, 640 - 150 - 80, 20),
                                 Style    = NSProgressIndicatorStyle.Bar,
diff --git a/SparkleShare/SparkleSetupController.cs b/SparkleShare/SparkleSetupController.cs
index 498e0a89..a0bdc454 100755
--- a/SparkleShare/SparkleSetupController.cs
+++ b/SparkleShare/SparkleSetupController.cs
@@ -135,12 +135,15 @@ namespace SparkleShare {
             SyncingFolder      = "";
 
             string local_plugins_path = SparklePlugin.LocalPluginsPath;
+            int local_plugins_count   = 0;
 
             // Import all of the plugins
             if (Directory.Exists (local_plugins_path))
                 // Local plugins go first...
-                foreach (string xml_file_path in Directory.GetFiles (local_plugins_path, "*.xml"))
+                foreach (string xml_file_path in Directory.GetFiles (local_plugins_path, "*.xml")) {
                     Plugins.Add (new SparklePlugin (xml_file_path));
+                    local_plugins_count++;
+                }
 
             // ...system plugins after that...
             if (Directory.Exists (Program.Controller.PluginsPath)) {
@@ -150,7 +153,7 @@ namespace SparkleShare {
                         Plugins.Insert (0, new SparklePlugin (xml_file_path));
 
                     } else if (xml_file_path.EndsWith ("ssnet.xml")) {
-                        Plugins.Insert (1, new SparklePlugin (xml_file_path));
+                        Plugins.Insert ((local_plugins_count + 1), new SparklePlugin (xml_file_path));
 
                     } else {
                         Plugins.Add (new SparklePlugin (xml_file_path));
diff --git a/SparkleShare/Windows/SparkleSetup.cs b/SparkleShare/Windows/SparkleSetup.cs
index 1cf0fd11..2ed78510 100644
--- a/SparkleShare/Windows/SparkleSetup.cs
+++ b/SparkleShare/Windows/SparkleSetup.cs
@@ -439,9 +439,7 @@ namespace SparkleShare {
                         
                     case PageType.Syncing: {
                         Header      = "Adding project ‘" + Controller.SyncingFolder + "’…";
-                        Description = "This may take a while.\n" +
-                            "Are you sure it’s not coffee o'clock?";
-
+                        Description = "This may either take a short or a long time depending on the project's size."
 
                         Button finish_button = new Button () {
                             Content   = "Finish",