From 1bb18931e29dfe55a9b3368bd2393ac57c5fdebb Mon Sep 17 00:00:00 2001
From: Andrew Sapperstein <asapperstein@google.com>
Date: Wed, 16 Apr 2014 11:48:59 -0700
Subject: [PATCH] Send PLID with message instead of conversation.

Fixes b/13748439. Sending with conversation required
server-side changes and wasn't actually more memory efficient.
Arguably it would be less efficient.

Change-Id: I8e1be03e183c65e169da5152a4763d5f80460bb9
---
 src/com/android/email/provider/EmailProvider.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 66b7fabce..c57558abc 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -2321,7 +2321,6 @@ public class EmailProvider extends ContentProvider {
                 .add(UIProvider.ConversationColumns.ACCOUNT_URI,
                         uriWithColumn("uiaccount", MessageColumns.ACCOUNT_KEY))
                 .add(UIProvider.ConversationColumns.SENDER_INFO, MessageColumns.FROM_LIST)
-                .add(UIProvider.ConversationColumns.PERMALINK, null)
                 .build();
         }
         return sMessageListMap;
@@ -2391,6 +2390,7 @@ public class EmailProvider extends ContentProvider {
                         Integer.toString(UIProvider.SpamWarningLinkType.NO_LINK))
                 .add(UIProvider.MessageColumns.VIA_DOMAIN, null)
                 .add(UIProvider.MessageColumns.CLIPPED, "0")
+                .add(UIProvider.MessageColumns.PERMALINK, null)
                 .build();
         }
         return sMessageViewMap;