Index: Tomboy/Applet.cs
===================================================================
--- Tomboy/Applet.cs	(revision 1508)
+++ Tomboy/Applet.cs	(working copy)
@@ -1,4 +1,3 @@
-
 using System;
 using System.IO;
 using System.Reflection;
@@ -183,6 +182,14 @@
 			item.Image = new Gtk.Image (Gtk.Stock.Preferences, Gtk.IconSize.Menu);
 			item.Activated += ShowPreferences;
 			menu.Append (item);
+            
+			// Only add Synchronize Notes option if synchronization is configured.
+			string addin_id = Preferences.Get (Preferences.SYNC_SELECTED_SERVICE_ADDIN) as string;
+			item = new Gtk.ImageMenuItem (Catalog.GetString ("Synchronize Notes"));
+			item.Image = new Gtk.Image (Gtk.Stock.Convert, Gtk.IconSize.Menu);
+			item.Sensitive = !string.IsNullOrEmpty(addin_id);
+			item.Activated += SynchronizeNotes;
+			menu.Append (item);
 
 			item = new Gtk.ImageMenuItem (Catalog.GetString ("_Help"));
 			item.Image = new Gtk.Image (Gtk.Stock.Help, Gtk.IconSize.Menu);
@@ -209,6 +216,11 @@
 		{
 			Tomboy.ActionManager ["ShowPreferencesAction"].Activate ();
 		}
+        
+		void SynchronizeNotes (object sender, EventArgs args)
+		{
+			Tomboy.ActionManager ["NoteSynchronizationAction"].Activate ();
+		}
 
 		void ShowHelpContents (object sender, EventArgs args)
 		{
Index: Tomboy/NoteWindow.cs
===================================================================
--- Tomboy/NoteWindow.cs	(revision 1508)
+++ 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 ();
