diff --git a/thunderbird-redhat-default-prefs.js b/thunderbird-redhat-default-prefs.js
index 2495993..81d3c78 100644
--- a/thunderbird-redhat-default-prefs.js
+++ b/thunderbird-redhat-default-prefs.js
@@ -4,6 +4,7 @@ pref("browser.display.use_system_colors",   true);
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
 pref("intl.locale.matchOS", true);
+pref("mail.shell.checkDefaultClient", false);
 
 # Make hyperlinks work
 pref("network.protocol-handler.app.http", "COMMAND");
diff --git a/thunderbird.spec b/thunderbird.spec
index 2f72b57..1c611bf 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -9,7 +9,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        2.beta2%{?dist}
+Release:        2.1.beta2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -298,6 +298,9 @@ fi
 #===============================================================================
 
 %changelog
+* Mon Mar 23 2009 Christopher Aillon <caillon@redhat.com> - 3.0-2.1.beta2
+- Disable the default app nag dialog
+
 * Tue Mar 17 2009 Jan Horak <jhorak@redhat.com> - 3.0-2.beta2
 - Fixed clicked link does not open in browser (#489120)
 - Fixed missing help in thunderbird (#488885)