From 243b8319bd464ffc82bcd5cb72ddb37a5eacde1a Mon Sep 17 00:00:00 2001
From: Joshua Nelson <jyn514@gmail.com>
Date: Wed, 25 Oct 2017 23:13:44 -0400
Subject: [PATCH] Fixed issue
 [2847](https://github.com/k9mail/k-9/issues/2847).

---
 .../k9/ui/compose/QuotedMessagePresenter.java | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/k9mail/src/main/java/com/fsck/k9/ui/compose/QuotedMessagePresenter.java b/k9mail/src/main/java/com/fsck/k9/ui/compose/QuotedMessagePresenter.java
index 1e8beb103..06e1ba999 100644
--- a/k9mail/src/main/java/com/fsck/k9/ui/compose/QuotedMessagePresenter.java
+++ b/k9mail/src/main/java/com/fsck/k9/ui/compose/QuotedMessagePresenter.java
@@ -246,22 +246,28 @@ public class QuotedMessagePresenter {
         }
 
         if (messageFormat == MessageFormat.HTML) {
+            String bodyText; // defaults to null
             Part part = MimeUtility.findFirstPartByMimeType(messageViewInfo.message, "text/html");
             if (part != null) { // Shouldn't happen if we were the one who saved it.
                 quotedTextFormat = SimpleMessageFormat.HTML;
                 String text = MessageExtractor.getTextFromPart(part);
 
-                Timber.d("Loading message with offset %d, length %d. Text length is %d.",
-                        bodyOffset, bodyLength, text.length());
+                if (text == null) {
+                    Timber.d("Empty message; skipping.");
+                    bodyText = "";
+                } else {
+                    Timber.d("Loading message with offset %d, length %d. Text length is %d.",
+                            bodyOffset, bodyLength, text.length());
 
-                if (bodyOffset + bodyLength > text.length()) {
-                    // The draft was edited outside of K-9 Mail?
-                    Timber.d("The identity field from the draft contains an invalid LENGTH/OFFSET");
-                    bodyOffset = 0;
-                    bodyLength = 0;
+                    if (bodyOffset + bodyLength > text.length()) {
+                        // The draft was edited outside of K-9 Mail?
+                        Timber.d("The identity field from the draft contains an invalid LENGTH/OFFSET");
+                        bodyOffset = 0;
+                        bodyLength = 0;
+                    }
+                    // Grab our reply text.
+                    bodyText = text.substring(bodyOffset, bodyOffset + bodyLength);
                 }
-                // Grab our reply text.
-                String bodyText = text.substring(bodyOffset, bodyOffset + bodyLength);
                 view.setMessageContentCharacters(HtmlConverter.htmlToText(bodyText));
 
                 // Regenerate the quoted html without our user content in it.