diff --git a/src/com/android/email/mail/transport/Rfc822Output.java b/src/com/android/email/mail/transport/Rfc822Output.java
index f3503bab1..bc163c27e 100644
--- a/src/com/android/email/mail/transport/Rfc822Output.java
+++ b/src/com/android/email/mail/transport/Rfc822Output.java
@@ -62,6 +62,9 @@ public class Rfc822Output {
     /*package*/ static String buildBodyText(Context context, Message message,
             boolean appendQuotedText) {
         Body body = Body.restoreBodyWithMessageId(context, message.mId);
+        if (body == null) {
+            return null;
+        }
         String text = body.mTextContent;
 
         if (!appendQuotedText) {