diff --git a/build.gradle b/build.gradle
index 4005eeccd..fc7230c04 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ android {
     buildToolsVersion "22.0.1"
 
     defaultConfig {
-        versionCode 360
+        versionCode 361
         versionName "4.7.11"
         minSdkVersion 7
         targetSdkVersion 22
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index 7007198cc..d2a14c495 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -283,11 +283,11 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel
         });
         View body = getListBody(parent);
         listView = (SwipeRefreshLayout) body.findViewById(R.id.swipe_layout);
-        emptyView = (SwipeRefreshLayout) body.findViewById(R.id.swipe_layout_empty);
+        emptyView = (SwipeRefreshLayout) parent.findViewById(R.id.swipe_layout_empty);
         setupRefresh(listView);
         setupRefresh(emptyView);
         ((ListView) listView.findViewById(android.R.id.list)).setEmptyView(emptyView);
-        parent.addView(body, 0);
+        ((ViewGroup) parent.findViewById(R.id.task_list_body)).addView(body, 0);
         return parent;
     }
 
diff --git a/src/main/res/layout/task_list_activity.xml b/src/main/res/layout/task_list_activity.xml
index 465e573a9..10ec66cb6 100644
--- a/src/main/res/layout/task_list_activity.xml
+++ b/src/main/res/layout/task_list_activity.xml
@@ -3,9 +3,8 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/taskListParent"
     android:background="?attr/asContentBackground"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -14,19 +13,22 @@
     android:focusableInTouchMode="true"
     android:orientation="vertical">
 
-    <!-- Body goes here -->
+    <RelativeLayout
+        android:id="@+id/task_list_body"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include layout="@layout/task_list_swipe_layout_empty" />
+
+    </RelativeLayout>
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
         android:src="?attr/fab_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginEnd="16dp"
-        app:borderWidth="0dp" />
+        android:layout_gravity="end|bottom"
+        android:layout_margin="16dp"
+        app:borderWidth="0dp"/>
 
-</RelativeLayout>
+</android.support.design.widget.CoordinatorLayout>
diff --git a/src/main/res/layout/task_list_body_standard.xml b/src/main/res/layout/task_list_body_standard.xml
index a1c3fa0ad..612d9a8ff 100644
--- a/src/main/res/layout/task_list_body_standard.xml
+++ b/src/main/res/layout/task_list_body_standard.xml
@@ -1,23 +1,12 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_weight="100">
-
-    <android.support.v4.widget.SwipeRefreshLayout
-        android:id="@+id/swipe_layout"
+<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/swipe_layout"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+
+    <ListView
+        android:id="@android:id/list"
+        style="@style/TaskListView"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-
-        <ListView
-            android:id="@android:id/list"
-            style="@style/ListView"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:paddingBottom="104dp"
-            android:clipToPadding="false"/>
-
-    </android.support.v4.widget.SwipeRefreshLayout>
-
-    <include layout="@layout/task_list_swipe_layout_empty" />
+        android:layout_height="fill_parent"/>
 
-</RelativeLayout>
+</android.support.v4.widget.SwipeRefreshLayout>
diff --git a/src/main/res/layout/task_list_body_subtasks.xml b/src/main/res/layout/task_list_body_subtasks.xml
index 5012315cb..3127b2694 100644
--- a/src/main/res/layout/task_list_body_subtasks.xml
+++ b/src/main/res/layout/task_list_body_subtasks.xml
@@ -1,24 +1,13 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_weight="100">
-
-    <org.tasks.ui.DraggableSwipeRefreshLayout
-        android:id="@+id/swipe_layout"
+<org.tasks.ui.DraggableSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/swipe_layout"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+
+    <com.todoroo.astrid.ui.DraggableListView
+        android:id="@android:id/list"
+        style="@style/TaskListView"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-
-        <com.todoroo.astrid.ui.DraggableListView
-            android:id="@android:id/list"
-            style="@style/ListView"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:drawSelectorOnTop="false"
-            android:paddingBottom="104dp"
-            android:clipToPadding="false" />
-
-    </org.tasks.ui.DraggableSwipeRefreshLayout>
-
-    <include layout="@layout/task_list_swipe_layout_empty" />
+        android:layout_height="fill_parent"
+        android:drawSelectorOnTop="false"/>
 
-</RelativeLayout>
+</org.tasks.ui.DraggableSwipeRefreshLayout>
diff --git a/src/main/res/values-v11/styles.xml b/src/main/res/values-v11/styles.xml
new file mode 100644
index 000000000..53e1189bb
--- /dev/null
+++ b/src/main/res/values-v11/styles.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="TaskListView" parent="ListView">
+        <item name="android:paddingBottom">90dp</item>
+        <item name="android:clipToPadding">false</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 66a1472d2..4f37e53e9 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -142,6 +142,9 @@
         <item name="android:smoothScrollbar">true</item>
     </style>
 
+    <style name="TaskListView" parent="ListView">
+    </style>
+
     <!-- =============================================== TaskEditActivity == -->
 
     <style name="TEA_Dialog" parent="Theme.AppCompat.Light.Dialog">