diff --git a/src/com/android/email/activity/MessagesAdapter.java b/src/com/android/email/activity/MessagesAdapter.java
index d97fad959..07717f8d8 100644
--- a/src/com/android/email/activity/MessagesAdapter.java
+++ b/src/com/android/email/activity/MessagesAdapter.java
@@ -159,6 +159,9 @@ import java.util.Set;
                 text = context.getString(R.string.message_list_snippet, text, snippet);
             }
         }
+        if (text == null) {
+            text = "";
+        }
         itemView.mSnippet = text;
     }