diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java
index 99c48c625..dd9fae7d7 100644
--- a/src/com/fsck/k9/fragment/MessageListFragment.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -661,6 +661,10 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
     }
 
     private DateFormat getTimeFormat() {
+        if (mTimeFormat == null) {
+            setupFormats();
+        }
+
         return mTimeFormat;
     }