Display contact icons correctly in MMS ConversationItems

src/org/thoughtcrime/securesms/ConversationAdapter.java

@@ -43,7 +43,6 @@ import org.thoughtcrime.securesms.service.MessageNotifier;
 import ws.com.google.android.mms.MmsException;
 
 import java.util.LinkedHashMap;
-import java.util.Map.Entry;
 
 /**
  * A cursor adapter for a conversation thread.  Ultimately

src/org/thoughtcrime/securesms/recipients/Recipient.java

@@ -53,6 +53,7 @@ public class Recipient implements Parcelable {
     this.name         = in.readString();
     this.number       = in.readString();
     this.contactUri   = in.readParcelable(null);
+    this.contactPhoto = in.readParcelable(null);
   }
 
   public Uri getContactUri() {
@@ -75,6 +76,7 @@ public class Recipient implements Parcelable {
     dest.writeString(name);
     dest.writeString(number);
     dest.writeParcelable(contactUri, 0);
+    dest.writeParcelable(contactPhoto, 0);
   }
 
   public String toShortString() {