am 864682f9: Merge "email: prevent stock email app to unset firstSnippet on mark/unmark as read"

* commit '864682f9717b460b88c6b7120c1651bbbe27fe21':
  email: prevent stock email app to unset firstSnippet on mark/unmark as read

1 files changed, 7 insertions, 4 deletions

diff --git a/src/com/android/mail/providers/ConversationInfo.java b/src/com/android/mail/providers/ConversationInfo.java
index 60d47e8b2..ebbc4044a 100644
--- a/src/com/android/mail/providers/ConversationInfo.java
+++ b/src/com/android/mail/providers/ConversationInfo.java
@@ -136,10 +136,13 @@ public class ConversationInfo implements Parcelable {
         for (ParticipantInfo pi : participantInfos) {
             changed |= pi.markRead(read);
         }
-        if (read) {
-            firstSnippet = lastSnippet;
-        } else {
-            firstSnippet = firstUnreadSnippet;
+        // Change the firstSnippet only if the conversion has messages.
+        if (messageCount > 0) {
+            if (read) {
+                firstSnippet = lastSnippet;
+            } else {
+                firstSnippet = firstUnreadSnippet;
+            }
         }
         return changed;
     }