diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index 9509c9904..326192809 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -929,7 +929,12 @@ public class MessageView extends K9Activity implements OnClickListener {
                         mMessageView.showStatusMessage(text);
                     }
                     mMessageView.setHeaders(clonedMessage, account);
-                    setTitle(clonedMessage.getSubject());
+                    final String subject = clonedMessage.getSubject();
+                    if (subject == null || subject.equals("")) {
+                        setTitle(getString(R.string.general_no_subject));
+                    } else {
+                        setTitle(clonedMessage.getSubject());
+                    }
                     mMessageView.setOnFlagListener(new OnClickListener() {
                         @Override
                         public void onClick(View v) {