diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index d5b5f10bb..e7bbf2de1 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -28,6 +28,7 @@ import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.media.MediaMetadataRetriever;
@@ -69,6 +70,7 @@ import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -119,6 +121,7 @@ public class  ComposeActivity extends BaseActivity implements ComposeOptionsFrag
     private Button floatingBtn;
     private ImageButton pickBtn;
     private Button nsfwBtn;
+    private ProgressBar postProgress;
 
     private static class QueuedMedia {
         enum Type {
@@ -338,11 +341,17 @@ public class  ComposeActivity extends BaseActivity implements ComposeOptionsFrag
         floatingBtn = (Button) findViewById(R.id.floating_btn);
         pickBtn = (ImageButton) findViewById(R.id.compose_photo_pick);
         nsfwBtn = (Button) findViewById(R.id.action_toggle_nsfw);
-        ImageButton visibilityBtn = (ImageButton) findViewById(R.id.action_toggle_visibility);
+        final ImageButton visibilityBtn = (ImageButton) findViewById(R.id.action_toggle_visibility);
 
         floatingBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                pickBtn.setClickable(false);
+                nsfwBtn.setClickable(false);
+                visibilityBtn.setClickable(false);
+                floatingBtn.setEnabled(false);
+
+                postProgress.setVisibility(View.VISIBLE);
                 sendStatus();
             }
         });
@@ -392,6 +401,8 @@ public class  ComposeActivity extends BaseActivity implements ComposeOptionsFrag
             startingHideText = false;
         }
 
+        postProgress = (ProgressBar) findViewById(R.id.postProgress);
+        postProgress.setVisibility(View.INVISIBLE);
         updateNsfwButtonColor();
 
         String[] mentionedUsernames = null;
@@ -802,6 +813,7 @@ public class  ComposeActivity extends BaseActivity implements ComposeOptionsFrag
     }
 
     private void onSendFailure() {
+        postProgress.setVisibility(View.INVISIBLE);
         textEditor.setError(getString(R.string.error_generic));
         statusAlreadyInFlight = false;
     }
diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml
index e3620fef3..fd3dd7982 100644
--- a/app/src/main/res/layout/activity_compose.xml
+++ b/app/src/main/res/layout/activity_compose.xml
@@ -18,6 +18,43 @@
             android:background="@android:color/transparent"
             android:elevation="4dp" />
 
+        <RelativeLayout
+            android:id="@+id/compose_edit_area"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:paddingBottom="4dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <!--An special EditText is created at runtime here, because it has to be a modified
+             * anonymous class to support image/GIF picking from the soft keyboard.-->
+
+            <HorizontalScrollView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true">
+
+                <LinearLayout
+                    android:id="@+id/compose_media_preview_bar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <!--This is filled at runtime with ImageView's for each preview in the upload queue.-->
+
+                </LinearLayout>
+            </HorizontalScrollView>
+
+            <ProgressBar
+                android:id="@+id/postProgress"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true" />
+
+        </RelativeLayout>
+
         <LinearLayout
             android:id="@+id/compose_content_warning_bar"
             android:layout_width="match_parent"
@@ -44,35 +81,6 @@
                 android:background="?android:attr/listDivider"/>
         </LinearLayout>
 
-        <RelativeLayout
-            android:id="@+id/compose_edit_area"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:paddingBottom="4dp"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp">
-
-            <!--An special EditText is created at runtime here, because it has to be a modified
-             * anonymous class to support image/GIF picking from the soft keyboard.-->
-
-            <HorizontalScrollView
-                android:layout_alignParentBottom="true"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <LinearLayout
-                    android:id="@+id/compose_media_preview_bar"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <!--This is filled at runtime with ImageView's for each preview in the upload queue.-->
-
-                </LinearLayout>
-            </HorizontalScrollView>
-
-        </RelativeLayout>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -124,8 +132,9 @@
 
             <Button
                 android:id="@+id/floating_btn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:background="@drawable/compose_button_colors"
+                android:layout_width="80dp"
+                android:layout_height="35dp"
                 android:layout_marginLeft="10dp"
                 android:text="@string/action_send"
                 android:textColor="@android:color/white" />