Index: Tomboy/Tray.cs
===================================================================
--- Tomboy/Tray.cs	(revision 1765)
+++ Tomboy/Tray.cs	(working copy)
@@ -176,10 +176,12 @@
 				args.RetVal = true;
 				break;
 			case 2:
-				// Give some visual feedback
-				Gtk.Drag.Highlight (this);
-				args.RetVal = PastePrimaryClipboard ();
-				Gtk.Drag.Unhighlight (this);
+				if ((bool) Preferences.Get (Preferences.ENABLE_ICON_PASTE)) {
+					// Give some visual feedback
+					Gtk.Drag.Highlight (this);
+					args.RetVal = PastePrimaryClipboard ();
+					Gtk.Drag.Unhighlight (this);
+				}
 				break;
 			}
 		}
Index: Tomboy/Preferences.cs
===================================================================
--- Tomboy/Preferences.cs	(revision 1768)
+++ Tomboy/Preferences.cs	(working copy)
@@ -13,6 +13,7 @@
 		public const string ENABLE_KEYBINDINGS = "/apps/tomboy/enable_keybindings";
 		public const string ENABLE_STARTUP_NOTES = "/apps/tomboy/enable_startup_notes";
 		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 START_NOTE_URI = "/apps/tomboy/start_note";
 		public const string CUSTOM_FONT_FACE = "/apps/tomboy/custom_font_face";
@@ -71,6 +72,9 @@
 			case ENABLE_AUTO_BULLETED_LISTS:
 				return true;
 
+			case ENABLE_ICON_PASTE:
+				return false;
+
 			case START_NOTE_URI:
 				return String.Empty;
 
Index: data/tomboy.schemas.in
===================================================================
--- data/tomboy.schemas.in	(revision 1768)
+++ data/tomboy.schemas.in	(working copy)
@@ -46,6 +46,20 @@
     </schema>
 
     <schema>
+      <key>/schemas/apps/tomboy/enable_icon_paste</key>
+      <applyto>/apps/tomboy/enable_icon_paste</applyto>
+      <owner>tomboy</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+         <short>Enable Middle-Click Paste On Icon.</short>
+         <long>
+         Enable this option if you want to be able to middle-click the Tomboy icon to paste timestamped content into the Start Here note.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/tomboy/enable_custom_font</key>
       <applyto>/apps/tomboy/enable_custom_font</applyto>
       <owner>tomboy</owner>
