diff --git a/res/layout/message_recipient_list_item.xml b/res/layout/message_recipient_list_item.xml
index ca4b213842..2e24352585 100644
--- a/res/layout/message_recipient_list_item.xml
+++ b/res/layout/message_recipient_list_item.xml
@@ -56,6 +56,13 @@
                       tools:visibility="visible"
                       tools:text="New identity" />
 
+            <TextView android:id="@+id/action_description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                tools:visibility="visible"
+                tools:text="action" />
+
         </LinearLayout>
 
         <Button android:id="@+id/conflict_button"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 35ccff091c..c75345feb1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -885,6 +885,7 @@
     <!-- message_recipients_list_item -->
     <string name="message_recipients_list_item__verify">VERIFY</string>
     <string name="message_recipients_list_item__resend">RESEND</string>
+    <string name="message_recipients_list_item__resending">Resending...</string>
 
     <!-- GroupUtil -->
     <plurals name="GroupUtil_joined_the_group">
diff --git a/src/org/thoughtcrime/securesms/MessageRecipientListItem.java b/src/org/thoughtcrime/securesms/MessageRecipientListItem.java
index 842d7b0c54..c6b80dfcf2 100644
--- a/src/org/thoughtcrime/securesms/MessageRecipientListItem.java
+++ b/src/org/thoughtcrime/securesms/MessageRecipientListItem.java
@@ -50,6 +50,7 @@ public class MessageRecipientListItem extends RelativeLayout
   private Recipient       recipient;
   private FromTextView    fromView;
   private TextView        errorDescription;
+  private TextView        actionDescription;
   private Button          conflictButton;
   private Button          resendButton;
   private AvatarImageView contactPhotoImage;
@@ -68,6 +69,7 @@ public class MessageRecipientListItem extends RelativeLayout
   protected void onFinishInflate() {
     this.fromView          = (FromTextView)    findViewById(R.id.from);
     this.errorDescription  = (TextView)        findViewById(R.id.error_description);
+    this.actionDescription = (TextView)        findViewById(R.id.action_description);
     this.contactPhotoImage = (AvatarImageView) findViewById(R.id.contact_photo_image);
     this.conflictButton    = (Button)          findViewById(R.id.conflict_button);
     this.resendButton      = (Button)          findViewById(R.id.resend_button);
@@ -116,7 +118,10 @@ public class MessageRecipientListItem extends RelativeLayout
       resendButton.setOnClickListener(new OnClickListener() {
         @Override
         public void onClick(View v) {
-          resendButton.setEnabled(false);
+          resendButton.setVisibility(View.GONE);
+          errorDescription.setVisibility(View.GONE);
+          actionDescription.setVisibility(View.VISIBLE);
+          actionDescription.setText(R.string.message_recipients_list_item__resending);
           new ResendAsyncTask(masterSecret, record, networkFailure).execute();
         }
       });