diff --git a/Tomboy/Note.cs b/Tomboy/Note.cs
index 117d9cb..c14e947 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 (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 " +
-			                           "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);
-
-			int result = dialog.Run ();
-			if (result == 666) {
+		
+			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);
+				
+				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);
+
+				int result = dialog.Run ();
+				if (result == 666) {
+					foreach (Note note in notes) {
+						note.Manager.Delete (note);
+					}
+				}
+	
+				dialog.Destroy();
+			} else {
+			// no confirmation dialog
 				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..cafe135 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 false;  // show "Delete note" dialog
+
 			case START_NOTE_URI:
 				return String.Empty;
 
diff --git a/Tomboy/PreferencesDialog.cs b/Tomboy/PreferencesDialog.cs
index a0493b2..cf0beae 100644
--- a/Tomboy/PreferencesDialog.cs
+++ b/Tomboy/PreferencesDialog.cs
@@ -183,6 +183,14 @@ namespace Tomboy
 			                                        check);
 			SetupPropertyEditor (bullet_peditor);
 
+			// Disable "Delete Note" confirmation dialog
+
+			check = MakeCheckButton (Catalog.GetString ("Disable Delete Note confirmation"));
+			options_list.PackStart (check, false, false, 0);
+			peditor = Services.Factory.CreatePropertyEditorToggleButton (Preferences.ENABLE_DELETE_CONFIRM,
+					check);
+			SetupPropertyEditor (peditor);
+
 			// Custom font...
 
 			check = MakeCheckButton (Catalog.GetString ("Use custom _font"));
diff --git a/po/en_CA.po b/po/en_CA.po
index de83629..18efee3 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -763,3 +763,8 @@ msgstr "Appointments"
 #: ../Tomboy/Plugins/NoteOfTheDay.cs:169
 msgid "Create Note of the Day"
 msgstr "Create Note of the Day"
+
+#: ../Tomboy/PreferencesDialog.cs:190
+msgid "Disable Delete Note confirmation"
+msgstr "Disable Delete Note confirmation"
+
diff --git a/po/en_GB.po b/po/en_GB.po
index a4e0ac9..ce28d61 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2457,3 +2457,8 @@ msgstr ""
 
 #~ msgid "_Search Notes..."
 #~ msgstr "_Search Notes…"
+
+#: ../Tomboy/PreferencesDialog.cs:190
+msgid "Disable Delete Note confirmation"
+msgstr "Disable Delete Note confirmation"
+
