diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 8e1870836e..0215481264 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -1903,7 +1903,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     } else {
       buttonToggle.display(sendButton);
       quickAttachmentToggle.hide();
-      inlineAttachmentToggle.show();
+
+      if (!attachmentManager.isAttachmentPresent()) {
+        inlineAttachmentToggle.show();
+      } else {
+        inlineAttachmentToggle.hide();
+      }
     }
   }