diff -Naur flock/defaults/pref/flock.js flock.new/defaults/pref/flock.js
--- flock/defaults/pref/flock.js	2011-01-27 18:07:24.000000000 +0100
+++ flock.new/defaults/pref/flock.js	2011-02-27 14:45:39.413160791 +0100
@@ -405,7 +405,7 @@
 pref("browser.xul.error_pages.expert_bad_cert", false);
 
 // We want to make sure mail URLs are handled externally...
-pref("network.protocol-handler.external.mailto", true); // for mail
+pref("network.protocol-handler.app.mailto", "/usr/bin/thunderbird");
 pref("network.protocol-handler.external.news", true);   // for news
 pref("network.protocol-handler.external.snews", true);  // for secure news
 pref("network.protocol-handler.external.nntp", true);   // also news
diff -Naur flock/flock-browser flock.new/flock-browser
--- flock/flock-browser	2011-01-27 18:07:24.000000000 +0100
+++ flock.new/flock-browser	2011-02-27 14:48:47.840160850 +0100
@@ -52,7 +52,15 @@
 #uncomment for debugging
 #set -x
 
-moz_libdir=/usr/local/lib/flock-2.6.2
+moz_libdir=/opt/flock
+
+# Include /usr/lib/mozilla/plugins in the plugin path:
+if [ "$MOZ_PLUGIN_PATH" ] ; then
+  MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:${moz_libdir}/plugins:/usr/lib/mozilla/plugins
+else
+  MOZ_PLUGIN_PATH=${moz_libdir}/plugins:/usr/lib/mozilla/plugins
+fi
+export MOZ_PLUGIN_PATH
 
 # Use run-mozilla.sh in the current dir if it exists
 # If not, then start resolving symlinks until we find run-mozilla.sh