From f492ee9d0b9192d4f9328d2cb8ddafc2ed89bed5 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Thu, 15 Jul 2010 03:47:45 +0000
Subject: [PATCH] back out the rest of my localDate changes for now due to user
 complaints.

---
 src/com/fsck/k9/mail/store/LocalStore.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java
index 9d039f8b7..fc1213d25 100644
--- a/src/com/fsck/k9/mail/store/LocalStore.java
+++ b/src/com/fsck/k9/mail/store/LocalStore.java
@@ -1772,7 +1772,8 @@ public class LocalStore extends Store implements Serializable
                     cv.put("reply_to_list", Address.pack(message.getReplyTo()));
                     cv.put("attachment_count", attachments.size());
                     cv.put("internal_date",  message.getInternalDate() == null
-                           ? null : message.getInternalDate().getTime());
+                           ? System.currentTimeMillis() : message.getInternalDate().getTime());
+
                     String messageId = message.getMessageId();
                     if (messageId != null)
                     {