diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 3f919a9de..388a751b9 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -2059,7 +2059,14 @@ public class MessageList
                     view.getBackground().setAlpha(127);
                 }
 
-                holder.subject.setText(message.subject);
+                if (message.subject == null || message.subject.equals(""))
+                {
+                    holder.subject.setText(getText(R.string.general_no_subject));
+                }
+                else
+                {
+                    holder.subject.setText(message.subject);
+                }
 
                 if (holder.preview != null)
                 {