diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java
index c2e3ea38b..578eb75c4 100644
--- a/src/com/fsck/k9/fragment/MessageListFragment.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -2979,13 +2979,16 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
         }
 
         if (mIsThreadDisplay) {
-            cursor.moveToFirst();
-            mTitle = cursor.getString(SUBJECT_COLUMN);
-            mTitle = Utility.stripSubject(mTitle);
-            if (StringUtils.isNullOrEmpty(mTitle)) {
-               mTitle = getString(R.string.general_no_subject);
+            if (cursor.moveToFirst()) {
+                mTitle = cursor.getString(SUBJECT_COLUMN);
+                mTitle = Utility.stripSubject(mTitle);
+                if (StringUtils.isNullOrEmpty(mTitle)) {
+                   mTitle = getString(R.string.general_no_subject);
+                }
+                refreshTitle();
+            } else {
+                //TODO: empty thread view -> return to full message list
             }
-            refreshTitle();
         }
 
         cleanupSelected(cursor);