diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 48d9f87146..05b3041d55 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -730,8 +730,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   private void initializeEnabledCheck() {
     boolean enabled = !(isPushGroupConversation() && !isActiveGroup());
-    composeText.setEnabled(enabled);
+    inputPanel.setEnabled(enabled);
     sendButton.setEnabled(enabled);
+    attachButton.setEnabled(enabled);
   }
 
   private void initializeDraftFromDatabase() {
diff --git a/src/org/thoughtcrime/securesms/components/InputPanel.java b/src/org/thoughtcrime/securesms/components/InputPanel.java
index ca2ff959c3..1067a05089 100644
--- a/src/org/thoughtcrime/securesms/components/InputPanel.java
+++ b/src/org/thoughtcrime/securesms/components/InputPanel.java
@@ -153,6 +153,13 @@ public class InputPanel extends LinearLayout
     this.microphoneRecorderView.cancelAction();
   }
 
+  public void setEnabled(boolean enabled) {
+    composeText.setEnabled(enabled);
+    emojiToggle.setEnabled(enabled);
+    quickAudioToggle.setEnabled(enabled);
+    quickCameraToggle.setEnabled(enabled);
+  }
+
   private long onRecordHideEvent(float x) {
     ListenableFuture<Void> future      = slideToCancel.hide(x);
     long                   elapsedTime = recordTime.hide();