From d4887e11be70796d8a9b7f2005c79a04b5fe67ab Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Fri, 30 Oct 2015 16:59:01 -0700
Subject: [PATCH] fix failed incoming MMS regression

Fixes #4308
Closes #4334
// FREEBIE
---
 src/org/thoughtcrime/securesms/ConversationItem.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index a16cff52de..eb7f32ef43 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -338,7 +338,7 @@ public class ConversationItem extends LinearLayout
   private void setFailedStatusIcons() {
     statusManager.displayFailed();
     dateText.setText(R.string.ConversationItem_error_not_delivered);
-    if (indicatorText != null) {
+    if (messageRecord.isOutgoing()) {
       indicatorText.setText(R.string.ConversationItem_click_for_details);
       indicatorText.setVisibility(View.VISIBLE);
     }
@@ -351,7 +351,7 @@ public class ConversationItem extends LinearLayout
   }
 
   private void setMinimumWidth() {
-    if (indicatorText != null && indicatorText.getVisibility() == View.VISIBLE && indicatorText.getText() != null) {
+    if (indicatorText.getVisibility() == View.VISIBLE && indicatorText.getText() != null) {
       final float density = getResources().getDisplayMetrics().density;
       bodyBubble.setMinimumWidth(indicatorText.getText().length() * (int) (6.5 * density) + (int) (22.0 * density));
     } else {