More recipient tests for reply/reply all/ fwd.

Also added _column to the end of the html_body and text_body
fields for message columns.
Change-Id: I565a89d9eb811d122ca7aafd62b15a97c3cfe484
diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index a280a37..8606248 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -352,8 +352,8 @@
     public static final int MESSAGE_BCC_COLUMN = 9;
     public static final int MESSAGE_REPLY_TO_COLUMN = 10;
     public static final int MESSAGE_DATE_RECEIVED_MS_COLUMN = 11;
-    public static final int MESSAGE_BODY_HTML = 12;
-    public static final int MESSAGE_BODY_TEXT = 13;
+    public static final int MESSAGE_BODY_HTML_COLUMN = 12;
+    public static final int MESSAGE_BODY_TEXT_COLUMN = 13;
     public static final int MESSAGE_EMBEDS_EXTERNAL_RESOURCES_COLUMN = 14;
     public static final int MESSAGE_REF_MESSAGE_ID_COLUMN = 15;
     public static final int MESSAGE_DRAFT_TYPE_COLUMN = 16;