Index: install/install_schema.sql
===================================================================
--- install/install_schema.sql	(revision 15177)
+++ install/install_schema.sql	(working copy)
@@ -100,13 +100,17 @@
   l3_Subject text,
   l4_Subject text,
   l5_Subject text,
-  l1_Body longtext,
-  l2_Body longtext,
-  l3_Body longtext,
-  l4_Body longtext,
-  l5_Body longtext,
+  l1_HtmlBody longtext,
+  l2_HtmlBody longtext,
+  l3_HtmlBody longtext,
+  l4_HtmlBody longtext,
+  l5_HtmlBody longtext,
+  l1_PlainTextBody longtext,
+  l2_PlainTextBody longtext,
+  l3_PlainTextBody longtext,
+  l4_PlainTextBody longtext,
+  l5_PlainTextBody longtext,
   Headers text,
-  MessageType varchar(4) NOT NULL DEFAULT 'text',
   Enabled int(11) NOT NULL DEFAULT '1',
   FrontEndOnly tinyint(3) unsigned NOT NULL DEFAULT '0',
   Module varchar(40) NOT NULL DEFAULT 'Core',
@@ -122,7 +126,17 @@
   KEY CustomSender (CustomSender),
   KEY SenderAddressType (SenderAddressType),
   KEY AllowChangingRecipient (AllowChangingRecipient),
-  KEY CustomRecipient (CustomRecipient)
+  KEY CustomRecipient (CustomRecipient),
+  KEY l1_HtmlBody (l1_HtmlBody(5)),
+  KEY l2_HtmlBody (l2_HtmlBody(5)),
+  KEY l3_HtmlBody (l3_HtmlBody(5)),
+  KEY l4_HtmlBody (l4_HtmlBody(5)),
+  KEY l5_HtmlBody (l5_HtmlBody(5)),
+  KEY l1_PlainTextBody (l1_PlainTextBody(5)),
+  KEY l2_PlainTextBody (l2_PlainTextBody(5)),
+  KEY l3_PlainTextBody (l3_PlainTextBody(5)),
+  KEY l4_PlainTextBody (l4_PlainTextBody(5)),
+  KEY l5_PlainTextBody (l5_PlainTextBody(5))
 );
 
 CREATE TABLE IdGenerator (