Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -N -r11320 -r11331
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11320)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11331)
@@ -964,6 +964,8 @@
 INSERT INTO ConfigurationAdmin VALUES ('CheckStopWords', 'la_Text_Website', 'la_config_CheckStopWords', 'checkbox', '', '', 10.29, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CheckStopWords', '0', 'In-Portal', 'in-portal:configure_general');
 
+ALTER TABLE SpamControl ADD INDEX (DataType);
+
 CREATE TABLE MailingLists (
   MailingId int(10) unsigned NOT NULL auto_increment,
   PortalUserId int(11) NOT NULL,
@@ -993,4 +995,4 @@
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MailingListQueuePerStep', 10, 'In-Portal', 'in-portal:configure_general');
 
 INSERT INTO ConfigurationAdmin VALUES ('MailingListSendPerStep', 'la_Text_smtp_server', 'la_config_MailingListSendPerStep', 'text', NULL, NULL, 30.10, 0, 0);
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MailingListSendPerStep', 10, 'In-Portal', 'in-portal:configure_general');
\ No newline at end of file
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MailingListSendPerStep', 10, 'In-Portal', 'in-portal:configure_general');>>>>>>> 1.19.2.69