diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java
index 56fbbaa5a..944611c5e 100644
--- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java
@@ -205,7 +205,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
     private ImageView pp_actionBar;
     private ProgressBar pp_progress;
     private Toast mToast;
-    private LinearLayout drawer_layout;
+    private RelativeLayout drawer_layout;
     private HorizontalScrollView picture_scrollview;
     private int currentCursorPosition, searchLength;
     private TextView toot_space_left;
diff --git a/app/src/main/res/layout-sw600dp/activity_toot.xml b/app/src/main/res/layout-sw600dp/activity_toot.xml
index 0ee675909..59bc6230f 100644
--- a/app/src/main/res/layout-sw600dp/activity_toot.xml
+++ b/app/src/main/res/layout-sw600dp/activity_toot.xml
@@ -19,7 +19,7 @@
     android:layout_height="match_parent"
     android:fillViewport="true">
 
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -38,21 +38,33 @@
             android:hint="@string/toot_cw_placeholder"
             android:visibility="gone" />
 
-        <app.fedilab.android.helper.MastalabAutoCompleteTextView
-            android:id="@+id/toot_content"
+        <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:layout_weight="1"
-            android:gravity="top|start"
-            android:hint="@string/toot_placeholder"
-            android:inputType="textMultiLine|textCapSentences"
-            android:minLines="4" />
+            android:layout_height="match_parent"
+            android:layout_above="@+id/bottom_bar_tooting"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginEnd="0dp"
+            android:layout_marginLeft="0dp"
+            android:layout_marginRight="0dp"
+            android:layout_marginBottom="0dp"
+            android:fillViewport="true">
 
+            <app.fedilab.android.helper.MastalabAutoCompleteTextView
+                android:id="@+id/toot_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:gravity="top|start"
+                android:hint="@string/toot_placeholder"
+                android:inputType="textMultiLine|textCapSentences"
+                android:minLines="4" />
+        </ScrollView>
         <LinearLayout
+            android:id="@+id/bottom_bar_tooting"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
             android:orientation="vertical">
 
             <RelativeLayout
@@ -203,5 +215,5 @@
                 android:text="@string/toot_sensitive"
                 android:visibility="gone" />
         </LinearLayout>
-    </LinearLayout>
+    </RelativeLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/activity_toot.xml b/app/src/main/res/layout/activity_toot.xml
index 1584d9f9d..dbbcfb4ef 100644
--- a/app/src/main/res/layout/activity_toot.xml
+++ b/app/src/main/res/layout/activity_toot.xml
@@ -19,7 +19,7 @@
     android:layout_height="match_parent"
     android:fillViewport="true">
 
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -38,20 +38,33 @@
             android:hint="@string/toot_cw_placeholder"
             android:visibility="gone" />
 
-        <app.fedilab.android.helper.MastalabAutoCompleteTextView
-            android:id="@+id/toot_content"
+        <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginTop="10dp"
-            android:layout_weight="1"
-            android:gravity="top|start"
-            android:hint="@string/toot_placeholder"
-            android:inputType="textMultiLine|textCapSentences"
-            android:minLines="4" />
+            android:layout_height="match_parent"
+            android:layout_above="@+id/bottom_bar_tooting"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginEnd="0dp"
+            android:layout_marginLeft="0dp"
+            android:layout_marginRight="0dp"
+            android:layout_marginBottom="0dp"
+            android:fillViewport="true">
 
+            <app.fedilab.android.helper.MastalabAutoCompleteTextView
+                android:id="@+id/toot_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:gravity="top|start"
+                android:hint="@string/toot_placeholder"
+                android:inputType="textMultiLine|textCapSentences"
+                android:minLines="4" />
+        </ScrollView>
         <LinearLayout
+            android:id="@+id/bottom_bar_tooting"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
             android:orientation="vertical">
 
             <RelativeLayout
@@ -106,8 +119,8 @@
                     android:layout_width="28dp"
                     android:layout_height="28dp"
                     android:layout_gravity="center"
-                    android:layout_marginRight="5dp"
                     android:layout_marginEnd="5dp"
+                    android:layout_marginRight="5dp"
                     android:adjustViewBounds="true"
                     android:background="@color/transparent"
                     android:contentDescription="@string/toot_select_image"
@@ -196,5 +209,5 @@
                 android:text="@string/toot_sensitive"
                 android:visibility="gone" />
         </LinearLayout>
-    </LinearLayout>
+    </RelativeLayout>
 </ScrollView>