diff --git a/thunderbird-redhat-default-prefs.js b/thunderbird-redhat-default-prefs.js
index 81d3c78..2e8043f 100644
--- a/thunderbird-redhat-default-prefs.js
+++ b/thunderbird-redhat-default-prefs.js
@@ -10,3 +10,9 @@ pref("mail.shell.checkDefaultClient", false);
 pref("network.protocol-handler.app.http", "COMMAND");
 pref("network.protocol-handler.app.https", "COMMAND");
 pref("network.protocol-handler.app.ftp", "COMMAND");
+
+# Disable global indexing by default
+pref("mailnews.database.global.indexer.enabled", false);
+
+# Do not switch to Smart Folders after upgrade to 3.0b4
+pref("mail.folder.views.version", "1")
diff --git a/thunderbird.spec b/thunderbird.spec
index 92dcd59..4bc6d68 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -11,7 +11,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        2.7.b4%{?dist}
+Release:        2.8.b4%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -288,6 +288,10 @@ fi
 #===============================================================================
 
 %changelog
+* Wed Oct 14 2009 Jan Horak <jhorak@redhat.com> - 3.0.2.8
+- Global indexing disabled by default
+- Migration to Smart Folders disabled by default
+
 * Thu Sep 17 2009 Jan Horak <jhorak@redhat.com> - 3.0-2.7
 - Update to 3.0 beta4