diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
index d10b4e2d48..55083f3a26 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
@@ -263,6 +263,8 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
         hud.hideSoftkey(composeText, null);
       }
 
+      sendButton.setEnabled(false);
+
       MediaSendFragment fragment = getMediaSendFragment();
 
       if (fragment != null) {
@@ -274,6 +276,8 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
       }
     });
 
+    sendButton.setOnLongClickListener(v -> true);
+
     sendButton.addOnTransportChangedListener((newTransport, manuallySelected) -> {
       presentCharactersRemaining();
       composeText.setTransport(newTransport);