diff --git a/Tomboy/Addins/NoteDirectoryWatcher/NoteDirectoryWatcherApplicationAddin.cs b/Tomboy/Addins/NoteDirectoryWatcher/NoteDirectoryWatcherApplicationAddin.cs
index 99adab8..5e01b16 100644
--- a/Tomboy/Addins/NoteDirectoryWatcher/NoteDirectoryWatcherApplicationAddin.cs
+++ b/Tomboy/Addins/NoteDirectoryWatcher/NoteDirectoryWatcherApplicationAddin.cs
@@ -208,7 +208,7 @@ namespace Tomboy.NoteDirectoryWatcher
 				}
 				
 				try {
-					note = Tomboy.DefaultNoteManager.CreateWithGuid (title, note_id);
+					note = Tomboy.DefaultNoteManager.CreateWithGuid (title, note_id, false);
 					if (note == null) {
 						Logger.Error ("NoteDirectoryWatcher: Unknown error creating note from {0}", note_path);
 						return;
diff --git a/Tomboy/NoteManager.cs b/Tomboy/NoteManager.cs
index 97fe345..7c3fea9 100644
--- a/Tomboy/NoteManager.cs
+++ b/Tomboy/NoteManager.cs
@@ -509,7 +509,7 @@ Ciao!");
 
 		public Note Create (string title)
 		{
-			return CreateNewNote (title, null);
+			return CreateNewNote (title, null, false);
 		}
 
 		public Note Create (string title, string xml_content)
@@ -517,15 +517,15 @@ Ciao!");
 			return CreateNewNote (title, xml_content, null);
 		}
 
-		public Note CreateWithGuid (string title, string guid)
+		public Note CreateWithGuid (string title, string guid, bool no_default)
 		{
-			return CreateNewNote (title, guid);
+			return CreateNewNote (title, guid, no_default);
 		}
 
 		// Create a new note with the specified title from the default
 		// template note. Optionally the body can be overridden by appending
 		// it to title.
-		private Note CreateNewNote (string title, string guid)
+		private Note CreateNewNote (string title, string guid, bool no_default)
 		{
 			string body = null;
 
@@ -533,10 +533,14 @@ Ciao!");
 			if (title == null)
 				return null;
 			
-			Note template_note = GetOrCreateTemplateNote ();
+			Note template_note = null;
+			if (no_default == false)
+			{
+				template_note = GetOrCreateTemplateNote ();
 
-			if (String.IsNullOrEmpty (body))
-				return CreateNoteFromTemplate (title, template_note, guid);
+				if (String.IsNullOrEmpty (body))
+					return CreateNoteFromTemplate (title, template_note, guid);
+			}
 			
 			// Use a simple "Describe..." body and highlight
 			// it so it can be easily overwritten
diff --git a/Tomboy/RemoteControl.cs b/Tomboy/RemoteControl.cs
index 3faef23..1194c82 100644
--- a/Tomboy/RemoteControl.cs
+++ b/Tomboy/RemoteControl.cs
@@ -152,7 +152,7 @@ namespace Tomboy
 				return string.Empty;
 
 			try {
-				note = note_manager.CreateWithGuid (linked_title, guid);
+				note = note_manager.CreateWithGuid (linked_title, guid, false);
 				note.QueueSave (ChangeType.ContentChanged);
 				return note.Uri;
 			} catch {
diff --git a/Tomboy/Synchronization/SyncManager.cs b/Tomboy/Synchronization/SyncManager.cs
index a175929..fe89cca 100644
--- a/Tomboy/Synchronization/SyncManager.cs
+++ b/Tomboy/Synchronization/SyncManager.cs
@@ -658,7 +658,7 @@ namespace Tomboy.Sync
 			// To be consistent, any exceptions in the delgate will be caught
 			// and then rethrown in the synchronization thread.
 			GuiUtils.GtkInvokeAndWait (() => {
-				Note existingNote = NoteMgr.CreateWithGuid (noteUpdate.Title, noteUpdate.UUID);
+				Note existingNote = NoteMgr.CreateWithGuid (noteUpdate.Title, noteUpdate.UUID, true);
 				UpdateLocalNote (existingNote, noteUpdate, NoteSyncType.DownloadNew);
 			});
 		}
