diff --git a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
index f7b8d7268..0abaa7975 100755
--- a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
+++ b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
@@ -988,6 +988,8 @@ public abstract class EmailContent {
                 if (doSave) {
                     return super.save(context);
                 } else {
+                    // FLAG: Should we be doing this? In the base class, if someone calls "save" on
+                    // an EmailContent that is already saved, it throws an exception.
                     // Call update, rather than super.update in case we ever override it
                     if (update(context, toContentValues()) == 1) {
                         return getUri();
diff --git a/src/com/android/email/LegacyConversions.java b/src/com/android/email/LegacyConversions.java
index 4a903d84b..bd8b4caef 100644
--- a/src/com/android/email/LegacyConversions.java
+++ b/src/com/android/email/LegacyConversions.java
@@ -92,6 +92,9 @@ public class LegacyConversions {
         }
         if (sentDate != null) {
             localMessage.mTimeStamp = sentDate.getTime();
+        } else if (internalDate != null) {
+            LogUtils.w(Logging.LOG_TAG, "No sentDate, falling back to internalDate");
+            localMessage.mTimeStamp = internalDate.getTime();
         }
         if (subject != null) {
             localMessage.mSubject = subject;