diff --git a/Tomboy/Note.cs b/Tomboy/Note.cs
index e936c2f..023784a 100644
--- a/Tomboy/Note.cs
+++ b/Tomboy/Note.cs
@@ -1444,46 +1444,54 @@ namespace Tomboy
 		public static void ShowDeletionDialog (List<Note> notes, Gtk.Window parent)
 		{
 			string message;
+
+			if ((bool) Preferences.Get (Preferences.ENABLE_DELETE_CONFIRM)) {
+				// show confirmation dialog
+				if (notes.Count == 1)
+					message = Catalog.GetString ("Really delete this note?");
+				else
+					message = string.Format (Catalog.GetPluralString (
+						"Really delete this {0} note?",
+						"Really delete these {0} notes?",
+						notes.Count), notes.Count);
 			
-			if (notes.Count == 1)
-				message = Catalog.GetString ("Really delete this note?");
-			else
-				message = string.Format (Catalog.GetPluralString (
-					"Really delete this {0} note?",
-					"Really delete these {0} notes?",
-					notes.Count), notes.Count);
-			
-			HIGMessageDialog dialog =
-			        new HIGMessageDialog (
-			        parent,
-			        Gtk.DialogFlags.DestroyWithParent,
-			        Gtk.MessageType.Question,
-			        Gtk.ButtonsType.None,
-			        message,
-			        Catalog.GetString ("If you delete a note it is " +
+				HIGMessageDialog dialog =
+				        new HIGMessageDialog (
+				        parent,
+				        Gtk.DialogFlags.DestroyWithParent,
+				        Gtk.MessageType.Question,
+				        Gtk.ButtonsType.None,
+				        message,
+				        Catalog.GetString ("If you delete a note it is " +
 			                           "permanently lost."));
 
-			Gtk.Button button;
-
-			button = new Gtk.Button (Gtk.Stock.Cancel);
-			button.CanDefault = true;
-			button.Show ();
-			dialog.AddActionWidget (button, Gtk.ResponseType.Cancel);
-			dialog.DefaultResponse = Gtk.ResponseType.Cancel;
-
-			button = new Gtk.Button (Gtk.Stock.Delete);
-			button.CanDefault = true;
-			button.Show ();
-			dialog.AddActionWidget (button, 666);
+				Gtk.Button button;
+
+				button = new Gtk.Button (Gtk.Stock.Cancel);
+				button.CanDefault = true;
+				button.Show ();
+				dialog.AddActionWidget (button, Gtk.ResponseType.Cancel);
+				dialog.DefaultResponse = Gtk.ResponseType.Cancel;
+	
+				button = new Gtk.Button (Gtk.Stock.Delete);
+				button.CanDefault = true;
+				button.Show ();
+				dialog.AddActionWidget (button, 666);
+
+				int result = dialog.Run ();
+				if (result == 666) {
+					foreach (Note note in notes) {
+						note.Manager.Delete (note);
+					}
+				}
 
-			int result = dialog.Run ();
-			if (result == 666) {
+				dialog.Destroy();
+			} else {
+				// no confirmation dialog, just delete
 				foreach (Note note in notes) {
 					note.Manager.Delete (note);
 				}
 			}
-
-			dialog.Destroy();
 		}
 		
 		public static void ShowIOErrorDialog (Gtk.Window parent)
diff --git a/Tomboy/Preferences.cs b/Tomboy/Preferences.cs
index bba7738..2a80a38 100644
--- a/Tomboy/Preferences.cs
+++ b/Tomboy/Preferences.cs
@@ -15,6 +15,7 @@ namespace Tomboy
 		public const string ENABLE_AUTO_BULLETED_LISTS = "/apps/tomboy/enable_bulleted_lists";
 		public const string ENABLE_ICON_PASTE = "/apps/tomboy/enable_icon_paste";
 		public const string ENABLE_CLOSE_NOTE_ON_ESCAPE = "/apps/tomboy/enable_close_note_on_escape";
+		public const string ENABLE_DELETE_CONFIRM = "/apps/tomboy/enable_delete_confirm";
 
 		public const string START_NOTE_URI = "/apps/tomboy/start_note";
 		public const string CUSTOM_FONT_FACE = "/apps/tomboy/custom_font_face";
@@ -83,6 +84,9 @@ namespace Tomboy
 			case ENABLE_CLOSE_NOTE_ON_ESCAPE:
 				return true;
 
+			case ENABLE_DELETE_CONFIRM:
+				return true;
+
 			case START_NOTE_URI:
 				return String.Empty;
 
diff --git a/data/tomboy.schemas.in b/data/tomboy.schemas.in
index 423b2f2..b8eafff 100644
--- a/data/tomboy.schemas.in
+++ b/data/tomboy.schemas.in
@@ -107,6 +107,20 @@
     </schema>
 
     <schema>
+      <key>/schemas/apps/tomboy/enable_delete_confirm</key>
+      <applyto>/apps/tomboy/enable_delete_confirm</applyto>
+      <owner>tomboy</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+         <short>Enable the Delete Note confirmation dialog</short>
+         <long>
+	  If disabled, the "Delete Note" confirmation dialog will be suppressed.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/tomboy/start_note</key>
       <applyto>/apps/tomboy/start_note</applyto>
       <owner>tomboy</owner>
