diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index 54a1504fd4..aaa62578d2 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -259,7 +259,9 @@ public class ConversationItem extends LinearLayout
       int quoteWidth = quoteView.getMeasuredWidth();
 
       int availableWidth;
-      if (hasThumbnail(messageRecord)) {
+      if (hasAudio(messageRecord)) {
+        availableWidth = audioViewStub.get().getMeasuredWidth();
+      } else if (hasThumbnail(messageRecord)) {
         availableWidth = mediaThumbnailStub.get().getMeasuredWidth();
       } else {
         availableWidth = bodyBubble.getMeasuredWidth() - bodyBubble.getPaddingLeft() - bodyBubble.getPaddingRight();