diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index 038a202154..c9bbc9ba02 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -137,6 +137,7 @@
                           android:textColor="?conversation_item_sent_text_secondary_color"
                           android:textSize="@dimen/conversation_item_date_text_size"
                           android:paddingTop="1dip"
+                          android:paddingBottom="2dp"
                           tools:text="30 mins" />
 
                 <FrameLayout android:id="@+id/pending_indicator_stub"
@@ -193,7 +194,7 @@
             android:paddingBottom="3dp"
             android:layout_marginLeft="50dp"
             android:layout_marginRight="22dp"
-            android:layout_marginTop="-1dp"
+            android:layout_marginTop="-3dp"
             android:textSize="12sp"
             android:textColor="?conversation_item_sent_text_indicator_tab_color"
             android:background="?conversation_item_sent_indicator_text_background"
diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index 2206404326..cde78202e7 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -118,11 +118,13 @@ public class ConversationItem extends LinearLayout {
   protected void onFinishInflate() {
     super.onFinishInflate();
 
-    ViewGroup      pendingIndicatorStub = (ViewGroup) findViewById(R.id.pending_indicator_stub);
-    LayoutInflater inflater             = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+    ViewGroup pendingIndicatorStub = (ViewGroup) findViewById(R.id.pending_indicator_stub);
 
-    if (Build.VERSION.SDK_INT >= 11) inflater.inflate(R.layout.conversation_item_pending_v11, pendingIndicatorStub, true);
-    else                             inflater.inflate(R.layout.conversation_item_pending, pendingIndicatorStub, true);
+    if (pendingIndicatorStub != null) {
+      LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+      if (Build.VERSION.SDK_INT >= 11) inflater.inflate(R.layout.conversation_item_pending_v11, pendingIndicatorStub, true);
+      else                             inflater.inflate(R.layout.conversation_item_pending, pendingIndicatorStub, true);
+    }
 
     this.bodyText                 = (TextView)        findViewById(R.id.conversation_item_body);
     this.dateText                 = (TextView)        findViewById(R.id.conversation_item_date);