diff --git a/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java b/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
index d2340b871..6f97dbca8 100644
--- a/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
+++ b/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
@@ -1954,7 +1954,8 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
             DatabasePreviewType previewType = DatabasePreviewType.fromDatabaseValue(previewTypeString);
 
             switch (previewType) {
-                case NONE: {
+                case NONE:
+                case ERROR: {
                     return "";
                 }
                 case ENCRYPTED: {