diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessage.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessage.java
index 7a0fa44cb..d377bc55d 100644
--- a/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessage.java
+++ b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessage.java
@@ -308,8 +308,6 @@ public class LocalMessage extends MimeMessage {
                     cv.putNull("cc_list");
                     cv.putNull("bcc_list");
                     cv.putNull("preview");
-                    cv.putNull("html_content");
-                    cv.putNull("text_content");
                     cv.putNull("reply_to_list");
                     cv.putNull("message_part_id");
 
diff --git a/k9mail/src/main/java/com/fsck/k9/provider/EmailProvider.java b/k9mail/src/main/java/com/fsck/k9/provider/EmailProvider.java
index d599f4ac7..3ae32bd7c 100644
--- a/k9mail/src/main/java/com/fsck/k9/provider/EmailProvider.java
+++ b/k9mail/src/main/java/com/fsck/k9/provider/EmailProvider.java
@@ -152,8 +152,6 @@ public class EmailProvider extends ContentProvider {
     private interface InternalMessageColumns extends MessageColumns {
         public static final String DELETED = "deleted";
         public static final String EMPTY = "empty";
-        public static final String TEXT_CONTENT = "text_content";
-        public static final String HTML_CONTENT = "html_content";
         public static final String MIME_TYPE = "mime_type";
     }
 
diff --git a/k9mail/src/main/java/com/fsck/k9/search/SqlQueryBuilder.java b/k9mail/src/main/java/com/fsck/k9/search/SqlQueryBuilder.java
index 118467301..5cbb18ff6 100644
--- a/k9mail/src/main/java/com/fsck/k9/search/SqlQueryBuilder.java
+++ b/k9mail/src/main/java/com/fsck/k9/search/SqlQueryBuilder.java
@@ -140,8 +140,7 @@ public class SqlQueryBuilder {
                 break;
             }
             case MESSAGE_CONTENTS: {
-                columnName = "text_content";
-                break;
+                throw new RuntimeException("Searching in message bodies is currently not supported");
             }
             case REPLY_TO: {
                 columnName = "reply_to_list";