diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessageExtractor.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessageExtractor.java
index 864b9132f..229a166fe 100644
--- a/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessageExtractor.java
+++ b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessageExtractor.java
@@ -25,7 +25,7 @@ import static com.fsck.k9.mail.internet.Viewable.MessageHeader;
 import static com.fsck.k9.mail.internet.Viewable.Text;
 import static com.fsck.k9.mail.internet.Viewable.Textual;
 
-class LocalMessageExtractor {
+public class LocalMessageExtractor {
     private static final String TEXT_DIVIDER =
             "------------------------------------------------------------------------";
     private static final int TEXT_DIVIDER_LENGTH = TEXT_DIVIDER.length();
diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/ViewableContainer.java b/k9mail/src/main/java/com/fsck/k9/mailstore/ViewableContainer.java
index 2e538cd22..64e68527e 100644
--- a/k9mail/src/main/java/com/fsck/k9/mailstore/ViewableContainer.java
+++ b/k9mail/src/main/java/com/fsck/k9/mailstore/ViewableContainer.java
@@ -10,7 +10,7 @@ import java.util.List;
  *
  * @see LocalMessageExtractor#extractTextAndAttachments(android.content.Context, com.fsck.k9.mail.Message)
  */
-class ViewableContainer {
+public class ViewableContainer {
     /**
      * The viewable text of the message in plain text.
      */
diff --git a/k9mail/src/main/java/com/fsck/k9/view/SingleMessageView.java b/k9mail/src/main/java/com/fsck/k9/view/SingleMessageView.java
index 25852ee17..289256a31 100644
--- a/k9mail/src/main/java/com/fsck/k9/view/SingleMessageView.java
+++ b/k9mail/src/main/java/com/fsck/k9/view/SingleMessageView.java
@@ -58,6 +58,8 @@ import com.fsck.k9.mail.Part;
 import com.fsck.k9.mail.internet.MimeUtility;
 import com.fsck.k9.mailstore.LocalAttachmentBodyPart;
 import com.fsck.k9.mailstore.LocalMessage;
+import com.fsck.k9.mailstore.LocalMessageExtractor;
+import com.fsck.k9.mailstore.ViewableContainer;
 import com.fsck.k9.provider.AttachmentProvider.AttachmentProviderColumns;
 
 import org.apache.commons.io.IOUtils;
@@ -512,7 +514,9 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
         }
 
         if (text == null) {
-            text = message.getTextForDisplay();
+            //FIXME: Run the text extraction in a background thread because it might involve disk I/O
+            ViewableContainer viewables = LocalMessageExtractor.extractTextAndAttachments(getContext(), message);
+            text = viewables.html;
         }
 
         // Save the text so we can reset the WebView when the user clicks the "Show pictures" button