diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index 8898c00..298b070 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -58,6 +58,7 @@
 import com.android.mail.providers.Folder;
 import com.android.mail.providers.ListParams;
 import com.android.mail.providers.Message;
+import com.android.mail.providers.Settings;
 import com.android.mail.providers.UIProvider;
 import com.android.mail.providers.UIProvider.AccountCapabilities;
 import com.android.mail.providers.UIProvider.FolderCapabilities;
@@ -353,11 +354,12 @@
             final boolean safeForImages = msg.alwaysShowImages /* || savedStateSaysSafe */;
             allowNetworkImages |= safeForImages;
 
+            Settings settings = mActivity.getSettings();
             final int headerPos = mAdapter
                     .addMessageHeader(
                             msg,
-                            (mActivity.getSettings().replyBehavior
-                                    == UIProvider.DefaultReplyBehavior.REPLY_ALL),
+                            (settings != null ? mActivity.getSettings().replyBehavior
+                                    == UIProvider.DefaultReplyBehavior.REPLY_ALL : false),
                             true /* expanded */);
             final MessageHeaderItem headerItem = (MessageHeaderItem) mAdapter.getItem(headerPos);
 
