Index: Tomboy/NoteWindow.cs
===================================================================
--- Tomboy/NoteWindow.cs	(revision 1592)
+++ Tomboy/NoteWindow.cs	(working copy)
@@ -16,6 +16,7 @@
 		Gtk.Widget link_button;
 		NoteTextMenu text_menu;
 		Gtk.Menu plugin_menu;
+                Gtk.ImageMenuItem sync_menu_item;
 		Gtk.TextView editor;
 		Gtk.ScrolledWindow editor_window;
 //		NoteTagBar tag_bar;
@@ -181,6 +182,8 @@
 
 		protected override bool OnDeleteEvent (Gdk.Event evnt)
 		{
+                        Preferences.SettingChanged -= Preferences_SettingChanged;
+			
 			CloseWindowHandler (null, null);
 			return true;
 		}
@@ -476,16 +479,34 @@
 			if (note.IsSpecial)
 				delete.Sensitive = false;
 
-			Gtk.ImageMenuItem item = 
-				new Gtk.ImageMenuItem (Catalog.GetString ("Synchronize Notes"));
-			item.Image = new Gtk.Image (Gtk.Stock.Convert, Gtk.IconSize.Menu);
-			item.Activated += SyncItemSelected;
-			item.Show ();
-			PluginMenu.Add (item);
+                        sync_menu_item = new Gtk.ImageMenuItem (Catalog.GetString ("Synchronize Notes"));
+                        sync_menu_item.Image = new Gtk.Image (Gtk.Stock.Convert, Gtk.IconSize.Menu);
+                        sync_menu_item.Activated += SyncItemSelected;
+                        sync_menu_item.Show ();
+                        PluginMenu.Add (sync_menu_item);
 
+                        // We might want to know when various settings are altered.
+                        Preferences.SettingChanged += Preferences_SettingChanged;
+
+                        // Update items based on configuration.
+                        UpdateMenuItems ();
+
 			return toolbar;
 		}
-		
+
+                void Preferences_SettingChanged (object sender, EventArgs args)
+                {
+                        // Update items based on configuration.
+                        UpdateMenuItems ();
+                }
+
+                void UpdateMenuItems ()
+                {
+                        // Synchronization not configured?
+                        string sync_addin_id = (string)Preferences.Get (Preferences.SYNC_SELECTED_SERVICE_ADDIN);
+                        sync_menu_item.Sensitive = !string.IsNullOrEmpty (sync_addin_id);
+                }
+
 		void SyncItemSelected (object sender, EventArgs args)
 		{
 			Tomboy.ActionManager ["NoteSynchronizationAction"].Activate ();
